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
             }
             catch (Exception e)
             {
-                m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed ",  e);
-                Util.LogFailedXML("[COALESCED SCENE OBJECTS SERIALIZER]:", xml);
+                m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed ");
+////                m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed ", e);
+////                Util.LogFailedXML("[COALESCED SCENE OBJECTS SERIALIZER]:", xml);
                 return false;
             }
 
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
                     }
                     catch (Exception e)
                     {
-                        m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e);
-                        Util.LogFailedXML("[SERIALIZER]:", fixedData);
+                        m_log.Error("[SERIALIZER]: Deserialization of xml failed ");
+////                        m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e);
+////                        Util.LogFailedXML("[SERIALIZER]:", fixedData);
                         return null;
                     }
                 }
@@ -283,8 +284,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             }
             catch (Exception e)
             {
-                m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e);
-                Util.LogFailedXML("[SERIALIZER]:", xmlData);
+                m_log.Error("[SERIALIZER]: Deserialization of xml failed ");
+////                m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e);
+////                Util.LogFailedXML("[SERIALIZER]:", xmlData);
                 return null;
             }
         }
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
         {
             string xml = Utils.BytesToString(sceneObjectAsset.Data);
 
-            CoalescedSceneObjects coa;
-            if (CoalescedSceneObjectsSerializer.TryFromXml(xml, out coa))
-            {
-                foreach (SceneObjectGroup sog in coa.Objects)
-                    AddForInspection(sog);
-            }
+            if (String.IsNullOrEmpty(xml))
+                m_log.ErrorFormat("[UUIDGatherer]: Asset {0} - {1} has a zero length XML blob!", sceneObjectAsset.Name, sceneObjectAsset.ID);
             else
             {
-                SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml);
+                CoalescedSceneObjects coa;
+                if (CoalescedSceneObjectsSerializer.TryFromXml(xml, out coa))
+                {
+                    foreach (SceneObjectGroup sog in coa.Objects)
+                        AddForInspection(sog);
+                }
+                else
+                {
+                    SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml);
 
-                if (null != sog)
-                    AddForInspection(sog);
+                    if (null != sog)
+                        AddForInspection(sog);
+                }
             }
         }