From 6607b373d55e846acaa93fcb1c698a1cabeae4ed Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 20 Oct 2011 16:49:08 +0000
Subject: [PATCH] Fixed handling of reading/writing of osgVolume::VolumeTile
 tiles

---
 .../osgVolume/PropertyAdjustmentCallback.cpp               | 2 +-
 src/osgWrappers/serializers/osgVolume/Locator.cpp          | 7 ++++++-
 .../serializers/osgVolume/PropertyAdjustmentCallback.cpp   | 2 +-
 src/osgWrappers/serializers/osgVolume/VolumeTile.cpp       | 5 +++++
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/osgWrappers/deprecated-dotosg/osgVolume/PropertyAdjustmentCallback.cpp b/src/osgWrappers/deprecated-dotosg/osgVolume/PropertyAdjustmentCallback.cpp
index 1526a8704..83bb1c1d6 100644
--- a/src/osgWrappers/deprecated-dotosg/osgVolume/PropertyAdjustmentCallback.cpp
+++ b/src/osgWrappers/deprecated-dotosg/osgVolume/PropertyAdjustmentCallback.cpp
@@ -20,7 +20,7 @@ REGISTER_DOTOSGWRAPPER(PropertyAdjustmentCallback_Proxy)
 (
     new osgVolume::PropertyAdjustmentCallback,
     "PropertyAdjustmentCallback",
-    "Object NodeCallback PropertyAdjustmentCallback",
+    "osg::Object osg::NodeCallback osgVolume::PropertyAdjustmentCallback",
     PropertyAdjustmentCallback_readLocalData,
     PropertyAdjustmentCallback_writeLocalData
 );
diff --git a/src/osgWrappers/serializers/osgVolume/Locator.cpp b/src/osgWrappers/serializers/osgVolume/Locator.cpp
index 56805bccc..278e764b8 100644
--- a/src/osgWrappers/serializers/osgVolume/Locator.cpp
+++ b/src/osgWrappers/serializers/osgVolume/Locator.cpp
@@ -40,5 +40,10 @@ REGISTER_OBJECT_WRAPPER( osgVolume_Locator,
                          "osg::Object osgVolume::Locator" )
 {
     ADD_MATRIXD_SERIALIZER( Transform, osg::Matrixd() );  // _transform
-    ADD_USER_SERIALIZER( LocatorCallbacks );  // _locatorCallbacks
+
+    ADD_USER_SERIALIZER( LocatorCallbacks );
+    UPDATE_TO_VERSION( 90 )
+    {
+        REMOVE_SERIALIZER( LocatorCallbacks );
+    }
 }
diff --git a/src/osgWrappers/serializers/osgVolume/PropertyAdjustmentCallback.cpp b/src/osgWrappers/serializers/osgVolume/PropertyAdjustmentCallback.cpp
index cb15e6822..dab8a42c1 100644
--- a/src/osgWrappers/serializers/osgVolume/PropertyAdjustmentCallback.cpp
+++ b/src/osgWrappers/serializers/osgVolume/PropertyAdjustmentCallback.cpp
@@ -9,7 +9,7 @@
 REGISTER_OBJECT_WRAPPER( osgVolume_PropertyAdjustmentCallback,
                          new osgVolume::PropertyAdjustmentCallback,
                          osgVolume::PropertyAdjustmentCallback,
-                         "osg::Object osgVolume::PropertyAdjustmentCallback" )
+                         "osg::Object osg::NodeCallback osgVolume::PropertyAdjustmentCallback" )
 {
     ADD_INT_SERIALIZER( KeyEventCycleForward, 'v' );  // _cyleForwardKey
     ADD_INT_SERIALIZER( KeyEventCycleBackward, 'V' );  // _cyleBackwardKey
diff --git a/src/osgWrappers/serializers/osgVolume/VolumeTile.cpp b/src/osgWrappers/serializers/osgVolume/VolumeTile.cpp
index 98fa7fa0d..3fd6bd0e3 100644
--- a/src/osgWrappers/serializers/osgVolume/VolumeTile.cpp
+++ b/src/osgWrappers/serializers/osgVolume/VolumeTile.cpp
@@ -28,6 +28,11 @@ REGISTER_OBJECT_WRAPPER( osgVolume_VolumeTile,
                          "osg::Object osg::Node osg::Group osgVolume::VolumeTile" )
 {
     ADD_OBJECT_SERIALIZER( Volume, osgVolume::Volume, NULL );  // _volume
+    UPDATE_TO_VERSION( 90 )
+    {
+        REMOVE_SERIALIZER( Volume ); 
+    }
+    
     ADD_BOOL_SERIALIZER( Dirty, false );  // _dirty
     ADD_USER_SERIALIZER( TileID );  // _tileID
     ADD_OBJECT_SERIALIZER( VolumeTechnique, osgVolume::VolumeTechnique, NULL );  // _volumeTechnique