aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs5
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs10
-rw-r--r--OpenSim/Region/Framework/Scenes/UuidGatherer.cs23
3 files changed, 23 insertions, 15 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
index 1e42fc5..f45158b 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
@@ -178,8 +178,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
178 } 178 }
179 catch (Exception e) 179 catch (Exception e)
180 { 180 {
181 m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed ", e); 181 m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed ");
182 Util.LogFailedXML("[COALESCED SCENE OBJECTS SERIALIZER]:", xml); 182//// m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed ", e);
183//// Util.LogFailedXML("[COALESCED SCENE OBJECTS SERIALIZER]:", xml);
183 return false; 184 return false;
184 } 185 }
185 186
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 8f2c146..1ff788e 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -70,8 +70,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
70 } 70 }
71 catch (Exception e) 71 catch (Exception e)
72 { 72 {
73 m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e); 73 m_log.Error("[SERIALIZER]: Deserialization of xml failed ");
74 Util.LogFailedXML("[SERIALIZER]:", fixedData); 74//// m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e);
75//// Util.LogFailedXML("[SERIALIZER]:", fixedData);
75 return null; 76 return null;
76 } 77 }
77 } 78 }
@@ -283,8 +284,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
283 } 284 }
284 catch (Exception e) 285 catch (Exception e)
285 { 286 {
286 m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e); 287 m_log.Error("[SERIALIZER]: Deserialization of xml failed ");
287 Util.LogFailedXML("[SERIALIZER]:", xmlData); 288//// m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e);
289//// Util.LogFailedXML("[SERIALIZER]:", xmlData);
288 return null; 290 return null;
289 } 291 }
290 } 292 }
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index 453d95d..2070ce5 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -490,18 +490,23 @@ namespace OpenSim.Region.Framework.Scenes
490 { 490 {
491 string xml = Utils.BytesToString(sceneObjectAsset.Data); 491 string xml = Utils.BytesToString(sceneObjectAsset.Data);
492 492
493 CoalescedSceneObjects coa; 493 if (String.IsNullOrEmpty(xml))
494 if (CoalescedSceneObjectsSerializer.TryFromXml(xml, out coa)) 494 m_log.ErrorFormat("[UUIDGatherer]: Asset {0} - {1} has a zero length XML blob!", sceneObjectAsset.Name, sceneObjectAsset.ID);
495 {
496 foreach (SceneObjectGroup sog in coa.Objects)
497 AddForInspection(sog);
498 }
499 else 495 else
500 { 496 {
501 SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml); 497 CoalescedSceneObjects coa;
498 if (CoalescedSceneObjectsSerializer.TryFromXml(xml, out coa))
499 {
500 foreach (SceneObjectGroup sog in coa.Objects)
501 AddForInspection(sog);
502 }
503 else
504 {
505 SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml);
502 506
503 if (null != sog) 507 if (null != sog)
504 AddForInspection(sog); 508 AddForInspection(sog);
509 }
505 } 510 }
506 } 511 }
507 512