aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authoronefang2019-05-19 22:55:26 +1000
committeronefang2019-05-19 22:55:26 +1000
commit18bcf2f5445fa4ead0b38a64ac18bac64103d973 (patch)
tree5599531b2cd509ff6d43bb651c5152367f145440 /OpenSim/Region
parentRemove some script distance limits. (diff)
downloadopensim-SC_OLD-18bcf2f5445fa4ead0b38a64ac18bac64103d973.zip
opensim-SC_OLD-18bcf2f5445fa4ead0b38a64ac18bac64103d973.tar.gz
opensim-SC_OLD-18bcf2f5445fa4ead0b38a64ac18bac64103d973.tar.bz2
opensim-SC_OLD-18bcf2f5445fa4ead0b38a64ac18bac64103d973.tar.xz
Better archiver console spam.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/UuidGatherer.cs23
1 files changed, 14 insertions, 9 deletions
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index 80d3f62..d0b0e12 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -571,18 +571,23 @@ namespace OpenSim.Region.Framework.Scenes
571 { 571 {
572 string xml = Utils.BytesToString(sceneObjectAsset.Data); 572 string xml = Utils.BytesToString(sceneObjectAsset.Data);
573 573
574 CoalescedSceneObjects coa; 574 if (String.IsNullOrEmpty(xml))
575 if (CoalescedSceneObjectsSerializer.TryFromXml(xml, out coa)) 575 m_log.ErrorFormat("[UUIDGatherer]: Asset {0} - {1} has a zero length XML blob!", sceneObjectAsset.Name, sceneObjectAsset.ID);
576 {
577 foreach (SceneObjectGroup sog in coa.Objects)
578 AddForInspection(sog);
579 }
580 else 576 else
581 { 577 {
582 SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml); 578 CoalescedSceneObjects coa;
579 if (CoalescedSceneObjectsSerializer.TryFromXml(xml, out coa))
580 {
581 foreach (SceneObjectGroup sog in coa.Objects)
582 AddForInspection(sog);
583 }
584 else
585 {
586 SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml);
583 587
584 if (null != sog) 588 if (null != sog)
585 AddForInspection(sog); 589 AddForInspection(sog);
590 }
586 } 591 }
587 } 592 }
588 593