Thread: SF.net SVN: openvrml:[4078] branches/0.18 (Page 3)

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

Revision: 4078
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4078&view=rev
Author:   braden
Date:     2010-02-06 03:52:48 +0000 (Sat, 06 Feb 2010)

Log Message:
-----------
Ensure that plugin_streambuf::set_get_url_result gets called if browser_host::get_url throws.

Modified Paths:
--------------
    branches/0.18/ChangeLog
    branches/0.18/src/local/libopenvrml-control/openvrml_control/browser.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
   + /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

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

--- branches/0.18/ChangeLog	2010-02-06 03:47:40 UTC (rev 4077)
+++ branches/0.18/ChangeLog	2010-02-06 03:52:48 UTC (rev 4078)
@@ -1,3 +1,10 @@
+2010-02-05 Braden McDaniel  <br...@en...>
+
+	* src/local/libopenvrml-control/openvrml_control/browser.cpp
+	(openvrml_control::browser::resource_fetcher::do_get_resource(const
+	std::string &)): Ensure that plugin_streambuf::set_get_url_result
+	gets called if browser_host::get_url throws.
+
 2010-02-03 Braden McDaniel  <br...@en...>
 
 	* doc/Doxyfile: Suppress generation of the bug, todo, and test


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
   + /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


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
   + /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


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
   + /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


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
   + /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


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
   + /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


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
   + /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


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
   + /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

Modified: branches/0.18/src/local/libopenvrml-control/openvrml_control/browser.cpp
===================================================================
--- branches/0.18/src/local/libopenvrml-control/openvrml_control/browser.cpp	2010-02-06 03:47:40 UTC (rev 4077)
+++ branches/0.18/src/local/libopenvrml-control/openvrml_control/browser.cpp	2010-02-06 03:52:48 UTC (rev 4078)
@@ -527,9 +527,17 @@
                 uri, this->streambuf_);
 
             //
-            // browser_host::get_url could throw; let it.
+            // If browser_host::get_url throws, we need to make sure that
+            // plugin_streambuf::set_get_url_result gets called.  Otherwise,
+            // plugin_streambuf::init will block indefinitely.
             //
-            const int get_url_result = fetcher.control_host_.get_url(uri);
+            int get_url_result;
+            try {
+                get_url_result = fetcher.control_host_.get_url(uri);
+            } catch (...) {
+                this->streambuf_->set_get_url_result(-1);
+                throw;
+            }
 
             if (get_url_result != 0) {
                 this->setstate(ios_base::badbit);


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
   + /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


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
   + /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


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:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630
/trunk/src/node/x3d-cad-geometry/cad_face.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
   + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630
/trunk/src/node/x3d-cad-geometry/cad_face.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


Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630
/trunk/src/node/x3d-cad-geometry/cad_face.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
   + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630
/trunk/src/node/x3d-cad-geometry/cad_face.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


Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630
/trunk/src/node/x3d-cad-geometry/indexed_quad_set.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
   + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630
/trunk/src/node/x3d-cad-geometry/indexed_quad_set.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


Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630
/trunk/src/node/x3d-cad-geometry/indexed_quad_set.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
   + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630
/trunk/src/node/x3d-cad-geometry/indexed_quad_set.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


Property changes on: branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734
/trunk/src/node/x3d-cad-geometry/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
   + /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732
/branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689
/trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734
/trunk/src/node/x3d-cad-geometry/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


Property changes on: branches/0.18/src/node/x3d-core/metadata_double.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689
/branches/node-modules...
 
[truncated message content]

Thread: SF.net SVN: openvrml:[4078] branches/0.18 (Page 3)

openvrml-commit