Merge branch 'ubitwork'

1 files changed, 28 insertions, 0 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 19cb9fb..9f6dabb 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -350,6 +350,11 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
 
             m_SOPXmlProcessors.Add("Buoyancy", ProcessBuoyancy);
             m_SOPXmlProcessors.Add("VolumeDetectActive", ProcessVolumeDetectActive);
+
+            //Ubit comented until proper testing
+            //            m_SOPXmlProcessors.Add("Vehicle", ProcessVehicle);
+
+
             #endregion
 
             #region TaskInventoryXmlProcessors initialization
@@ -572,6 +577,25 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             obj.ClickAction = (byte)reader.ReadElementContentAsInt("ClickAction", String.Empty);
         }
 
+        private static void ProcessVehicle(SceneObjectPart obj, XmlTextReader reader)
+        {
+            bool errors = false;
+            SOPVehicle _vehicle = new SOPVehicle();
+
+            _vehicle.FromXml2(reader, out errors);
+
+            if (errors)
+            {
+                obj.sopVehicle = null;
+                m_log.DebugFormat(
+                    "[SceneObjectSerializer]: Parsing Vehicle for object part {0} {1} encountered errors.  Please see earlier log entries.",
+                    obj.Name, obj.UUID);
+            }
+            else
+                obj.sopVehicle = _vehicle;
+        }
+                   
+
         private static void ProcessShape(SceneObjectPart obj, XmlTextReader reader)
         {
             List<string> errorNodeNames;
@@ -1234,6 +1258,10 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             writer.WriteElementString("Buoyancy", sop.Buoyancy.ToString());
             writer.WriteElementString("VolumeDetectActive", sop.VolumeDetectActive.ToString().ToLower());
 
+            //Ubit comented until proper testing
+            //            if (sop.sopVehicle != null)
+            //                sop.sopVehicle.ToXml2(writer);
+
             writer.WriteEndElement();
         }