diff options
author | David Walter Seikel | 2016-11-22 16:57:41 +1000 |
---|---|---|
committer | David Walter Seikel | 2016-11-22 16:57:41 +1000 |
commit | 848035bf7228628b5f035c1de5d71cd6150dc7ce (patch) | |
tree | 70f23ab04d84da76959c6a54f0e5a710f43e1f4f /OpenSim/Region/Framework/Scenes/UuidGatherer.cs | |
parent | Various random white space clean ups. (diff) | |
download | opensim-SC_OLD-848035bf7228628b5f035c1de5d71cd6150dc7ce.zip opensim-SC_OLD-848035bf7228628b5f035c1de5d71cd6150dc7ce.tar.gz opensim-SC_OLD-848035bf7228628b5f035c1de5d71cd6150dc7ce.tar.bz2 opensim-SC_OLD-848035bf7228628b5f035c1de5d71cd6150dc7ce.tar.xz |
Remove zero length XML blob spam.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 23 |
1 files changed, 14 insertions, 9 deletions
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 | ||