Thread: SF.net SVN: openvrml:[4197] branches/0.18 (Page 5)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 4197
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4197&view=rev
Author:   braden
Date:     2010-09-18 17:58:21 +0000 (Sat, 18 Sep 2010)

Log Message:
-----------
SpiderMonkey included in the forthcoming XULRunner 1.9.3 includes changes to the JSPropertyOp function signature: a parameter that was a jsval in previous versions is now a jsid.  Test for this and adjust our usage accordingly.

Modified Paths:
--------------
    branches/0.18/ChangeLog
    branches/0.18/configure.ac
    branches/0.18/src/script/javascript.cpp

Property Changed:
----------------
    branches/0.18/
    branches/0.18/src/libopenvrml/openvrml/bad_url.cpp
    branches/0.18/src/libopenvrml/openvrml/bad_url.h
    branches/0.18/src/libopenvrml/openvrml/local/proto.cpp
    branches/0.18/src/libopenvrml/openvrml/local/proto.h
    branches/0.18/src/libopenvrml/openvrml/scene.cpp
    branches/0.18/src/libopenvrml/openvrml/scene.h
    branches/0.18/src/libopenvrml/openvrml/script.cpp
    branches/0.18/src/mozilla-plugin/
    branches/0.18/src/node/vrml97/register_node_metatypes.cpp
    branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp
    branches/0.18/src/node/x3d-cad-geometry/cad_face.h
    branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp
    branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h
    branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp
    branches/0.18/src/node/x3d-core/metadata_double.cpp
    branches/0.18/src/node/x3d-core/metadata_double.h
    branches/0.18/src/node/x3d-core/metadata_float.cpp
    branches/0.18/src/node/x3d-core/metadata_float.h
    branches/0.18/src/node/x3d-core/metadata_integer.cpp
    branches/0.18/src/node/x3d-core/metadata_integer.h
    branches/0.18/src/node/x3d-core/metadata_set.cpp
    branches/0.18/src/node/x3d-core/metadata_set.h
    branches/0.18/src/node/x3d-core/metadata_string.cpp
    branches/0.18/src/node/x3d-core/metadata_string.h
    branches/0.18/src/node/x3d-core/register_node_metatypes.cpp
    branches/0.18/src/node/x3d-dis/espdu_transform.cpp
    branches/0.18/src/node/x3d-dis/espdu_transform.h
    branches/0.18/src/node/x3d-dis/receiver_pdu.cpp
    branches/0.18/src/node/x3d-dis/receiver_pdu.h
    branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp
    branches/0.18/src/node/x3d-dis/signal_pdu.cpp
    branches/0.18/src/node/x3d-dis/signal_pdu.h
    branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp
    branches/0.18/src/node/x3d-dis/transmitter_pdu.h
    branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp
    branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp
    branches/0.18/src/node/x3d-environmental-effects/texture_background.h
    branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp
    branches/0.18/src/node/x3d-event-utilities/boolean_filter.h
    branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp
    branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h
    branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp
    branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h
    branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp
    branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h
    branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp
    branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h
    branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp
    branches/0.18/src/node/x3d-event-utilities/integer_trigger.h
    branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp
    branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp
    branches/0.18/src/node/x3d-event-utilities/time_trigger.h
    branches/0.18/src/node/x3d-geometry2d/arc2d.cpp
    branches/0.18/src/node/x3d-geometry2d/arc2d.h
    branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp
    branches/0.18/src/node/x3d-geometry2d/arc_close2d.h
    branches/0.18/src/node/x3d-geometry2d/circle2d.cpp
    branches/0.18/src/node/x3d-geometry2d/circle2d.h
    branches/0.18/src/node/x3d-geometry2d/disk2d.cpp
    branches/0.18/src/node/x3d-geometry2d/disk2d.h
    branches/0.18/src/node/x3d-geometry2d/polyline2d.cpp
    branches/0.18/src/node/x3d-geometry2d/polyline2d.h
    branches/0.18/src/node/x3d-geometry2d/polypoint2d.cpp
    branches/0.18/src/node/x3d-geometry2d/polypoint2d.h
    branches/0.18/src/node/x3d-geometry2d/rectangle2d.cpp
    branches/0.18/src/node/x3d-geometry2d/rectangle2d.h
    branches/0.18/src/node/x3d-geometry2d/register_node_metatypes.cpp
    branches/0.18/src/node/x3d-geometry2d/triangle_set2d.cpp
    branches/0.18/src/node/x3d-geometry2d/triangle_set2d.h
    branches/0.18/src/node/x3d-geospatial/geo_coordinate.cpp
    branches/0.18/src/node/x3d-geospatial/geo_coordinate.h
    branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.cpp
    branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.h
    branches/0.18/src/node/x3d-geospatial/geo_location.cpp
    branches/0.18/src/node/x3d-geospatial/geo_location.h
    branches/0.18/src/node/x3d-geospatial/geo_lod.cpp
    branches/0.18/src/node/x3d-geospatial/geo_lod.h
    branches/0.18/src/node/x3d-geospatial/geo_metadata.cpp
    branches/0.18/src/node/x3d-geospatial/geo_metadata.h
    branches/0.18/src/node/x3d-geospatial/geo_origin.cpp
    branches/0.18/src/node/x3d-geospatial/geo_origin.h
    branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.cpp
    branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.h
    branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.cpp
    branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.h
    branches/0.18/src/node/x3d-geospatial/geo_viewpoint.cpp
    branches/0.18/src/node/x3d-geospatial/geo_viewpoint.h
    branches/0.18/src/node/x3d-geospatial/register_node_metatypes.cpp
    branches/0.18/src/node/x3d-grouping/register_node_metatypes.cpp
    branches/0.18/src/node/x3d-grouping/static_group.cpp
    branches/0.18/src/node/x3d-grouping/static_group.h
    branches/0.18/src/node/x3d-h-anim/h_anim_displacer.cpp
    branches/0.18/src/node/x3d-h-anim/h_anim_displacer.h
    branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.cpp
    branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.h
    branches/0.18/src/node/x3d-h-anim/h_anim_joint.cpp
    branches/0.18/src/node/x3d-h-anim/h_anim_joint.h
    branches/0.18/src/node/x3d-h-anim/h_anim_segment.cpp
    branches/0.18/src/node/x3d-h-anim/h_anim_segment.h
    branches/0.18/src/node/x3d-h-anim/h_anim_site.cpp
    branches/0.18/src/node/x3d-h-anim/h_anim_site.h
    branches/0.18/src/node/x3d-h-anim/register_node_metatypes.cpp
    branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.cpp
    branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.h
    branches/0.18/src/node/x3d-interpolation/position_interpolator2d.cpp
    branches/0.18/src/node/x3d-interpolation/position_interpolator2d.h
    branches/0.18/src/node/x3d-interpolation/register_node_metatypes.cpp
    branches/0.18/src/node/x3d-key-device-sensor/key_sensor.cpp
    branches/0.18/src/node/x3d-key-device-sensor/key_sensor.h
    branches/0.18/src/node/x3d-key-device-sensor/register_node_metatypes.cpp
    branches/0.18/src/node/x3d-key-device-sensor/string_sensor.cpp
    branches/0.18/src/node/x3d-key-device-sensor/string_sensor.h
    branches/0.18/src/node/x3d-networking/load_sensor.cpp
    branches/0.18/src/node/x3d-networking/load_sensor.h
    branches/0.18/src/node/x3d-networking/register_node_metatypes.cpp
    branches/0.18/src/node/x3d-nurbs/contour2d.cpp
    branches/0.18/src/node/x3d-nurbs/contour2d.h
    branches/0.18/src/node/x3d-nurbs/contour_polyline2d.cpp
    branches/0.18/src/node/x3d-nurbs/contour_polyline2d.h
    branches/0.18/src/node/x3d-nurbs/coordinate_double.cpp
    branches/0.18/src/node/x3d-nurbs/coordinate_double.h
    branches/0.18/src/node/x3d-nurbs/nurbs_curve.cpp
    branches/0.18/src/node/x3d-nurbs/nurbs_curve.h
    branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.cpp
    branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.h
    branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp
    branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.h
    branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.cpp
    branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.h
    branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.cpp
    branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.h
    branches/0.18/src/node/x3d-nurbs/nurbs_set.cpp
    branches/0.18/src/node/x3d-nurbs/nurbs_set.h
    branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp
    branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.h
    branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.cpp
    branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.h
    branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.cpp
    branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.h
    branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp
    branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.h
    branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp
    branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.h
    branches/0.18/src/node/x3d-nurbs/register_node_metatypes.cpp
    branches/0.18/src/node/x3d-rendering/color_rgba.cpp
    branches/0.18/src/node/x3d-rendering/color_rgba.h
    branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.cpp
    branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.h
    branches/0.18/src/node/x3d-rendering/indexed_triangle_set.cpp
    branches/0.18/src/node/x3d-rendering/indexed_triangle_set.h
    branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.cpp
    branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.h
    branches/0.18/src/node/x3d-rendering/register_node_metatypes.cpp
    branches/0.18/src/node/x3d-rendering/triangle_fan_set.cpp
    branches/0.18/src/node/x3d-rendering/triangle_fan_set.h
    branches/0.18/src/node/x3d-rendering/triangle_set.cpp
    branches/0.18/src/node/x3d-rendering/triangle_set.h
    branches/0.18/src/node/x3d-rendering/triangle_strip_set.cpp
    branches/0.18/src/node/x3d-rendering/triangle_strip_set.h
    branches/0.18/src/node/x3d-shape/fill_properties.cpp
    branches/0.18/src/node/x3d-shape/fill_properties.h
    branches/0.18/src/node/x3d-shape/line_properties.cpp
    branches/0.18/src/node/x3d-shape/line_properties.h
    branches/0.18/src/node/x3d-shape/register_node_metatypes.cpp
    branches/0.18/src/node/x3d-texturing/multi_texture.cpp
    branches/0.18/src/node/x3d-texturing/multi_texture.h
    branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.cpp
    branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.h
    branches/0.18/src/node/x3d-texturing/multi_texture_transform.cpp
    branches/0.18/src/node/x3d-texturing/multi_texture_transform.h
    branches/0.18/src/node/x3d-texturing/register_node_metatypes.cpp
    branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.cpp
    branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.h


Property changes on: branches/0.18
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194
   + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196

Modified: branches/0.18/ChangeLog
===================================================================

--- branches/0.18/ChangeLog	2010-09-18 17:54:51 UTC (rev 4196)
+++ branches/0.18/ChangeLog	2010-09-18 17:58:21 UTC (rev 4197)
@@ -1,3 +1,13 @@
+2010-09-18 Braden McDaniel  <br...@en...>
+
+	SpiderMonkey included in the forthcoming XULRunner 1.9.3 includes
+	changes to the JSPropertyOp function signature: a parameter that
+	was a jsval in previous versions is now a jsid.  Test for this and
+	adjust our usage accordingly.
+
+	* configure.ac
+	* src/script/javascript.cpp
+
 2010-09-15 Braden McDaniel  <br...@en...>
 
 	* src/script/javascript.cpp: JS_NewDouble is deprecated; use

Modified: branches/0.18/configure.ac
===================================================================
--- branches/0.18/configure.ac	2010-09-18 17:54:51 UTC (rev 4196)
+++ branches/0.18/configure.ac	2010-09-18 17:58:21 UTC (rev 4197)
@@ -171,6 +171,36 @@
 CPPFLAGS=$ov_save_CPPFLAGS
 
 #
+# The JSPropertyOp function signature changed from XULRunner 1.9.2 to
+# 1.9.3: the third argument changed from jsval to jsid.
+#
+AC_CACHE_CHECK([whether JSPropertyOp uses jsid],
+[ov_cv_jspropertyop_uses_jsid],
+[ov_cv_jspropertyop_uses_jsid=no
+#
+# Test using C++ since C probably doesn't care so much about the type.
+#
+ov_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$JS_CFLAGS $CPPFLAGS"
+AC_LANG_PUSH([C++])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+[[#include <jsapi.h>]],
+[[
+JSBool (*fn)(JSContext *, JSObject *, jsval, jsval*);
+JSPropertyOp op = fn;
+]])], ,
+[ov_cv_jspropertyop_uses_jsid=yes])
+AC_LANG_POP([C++])
+CPPFLAGS=$ov_save_CPPFLAGS
+])
+AS_IF([test X$ov_cv_jspropertyop_uses_jsid = Xyes],
+      [jspropertyop_uses_jsid=1],
+      [jspropertyop_uses_jsid=0])
+AC_DEFINE_UNQUOTED([OPENVRML_JSPROPERTYOP_USES_JSID],
+                   [$jspropertyop_uses_jsid],
+                   [Whether JSPropertyOp function signatures use jsid])
+
+#
 # openvrml-xembed and openvrml-player both use GOption, which was
 # introduced in GLib 2.6.
 #


Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194
   + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196


Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801
/branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674
/trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194
   + /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801
/branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674
/trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196


Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689
/branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688
/branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194
   + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689
/branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688
/branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196


Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689
/branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688
/branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801
/trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194
   + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689
/branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688
/branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801
/trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196


Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194
   + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196


Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801
/trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194
   + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801
/trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196


Property changes on: branches/0.18/src/libopenvrml/openvrml/script.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194
   + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196


Property changes on: branches/0.18/src/mozilla-plugin
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194
   + /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196


Property changes on: branches/0.18/src/node/vrml97/register_node_metatypes.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734
/trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194
   + /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734
/trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196


Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:37...
 
[truncated message content]

Thread: SF.net SVN: openvrml:[4197] branches/0.18 (Page 5)

openvrml-commit