ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Melanie
2012-07-07 19:59:55 +02:00
parent 6d5693a866
commit 470019b52a
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
View File

@@ -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)