Change semantics of FromXML on vehicle data to make the serializer a bit cleaner

2 files changed, 19 insertions, 7 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SOPVehicle.cs b/OpenSim/Region/Framework/Scenes/SOPVehicle.cs
index e2ef77b..41e8944 100644
--- a/OpenSim/Region/Framework/Scenes/SOPVehicle.cs
+++ b/OpenSim/Region/Framework/Scenes/SOPVehicle.cs
@@ -599,7 +599,20 @@ namespace OpenSim.Region.Framework.Scenes
             return v;
         }
 
-        public void FromXml2(XmlTextReader _reader, out bool errors)
+        public static SOPVehicle FromXml2(XmlTextReader reader)
+        {
+            SOPVehicle vehicle = new SOPVehicle();
+
+            bool errors = false;
+
+            vehicle.FromXml2(reader, out errors);
+            if (errors)
+                return null;
+
+            return vehicle;
+        }
+
+        private void FromXml2(XmlTextReader _reader, out bool errors)
         {
             errors = false;
             reader = _reader;
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index c7e4c3e..abca14f 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -623,12 +623,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
 
         private static void ProcessVehicle(SceneObjectPart obj, XmlTextReader reader)
         {
-            bool errors = false;
-            SOPVehicle _vehicle = new SOPVehicle();
+            SOPVehicle vehicle = SOPVehicle.FromXml2(reader);
 
-            _vehicle.FromXml2(reader, out errors);
-
-            if (errors)
+            if (vehicle == null)
             {
                 obj.VehicleParams = null;
                 m_log.DebugFormat(
@@ -636,7 +633,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                     obj.Name, obj.UUID);
             }
             else
-                obj.VehicleParams = _vehicle;
+            {
+                obj.VehicleParams = vehicle;
+            }
         }
                    
         private static void ProcessShape(SceneObjectPart obj, XmlTextReader reader)