1 files changed, 29 insertions, 18 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
index babcb54..55455cc 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
@@ -117,29 +117,40 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             {                
                 using (XmlTextReader reader = new XmlTextReader(sr))
                 {
-                    reader.Read();
-                    if (reader.Name != "CoalescedObject")
+                    try
                     {
-//                        m_log.DebugFormat(
-//                            "[COALESCED SCENE OBJECTS SERIALIZER]: TryFromXml() root element was {0} so returning false", 
-//                            reader.Name);
+                        reader.Read();
+                        if (reader.Name != "CoalescedObject")
+                        {
+    //                        m_log.DebugFormat(
+    //                            "[COALESCED SCENE OBJECTS SERIALIZER]: TryFromXml() root element was {0} so returning false", 
+    //                            reader.Name);
+                            
+                            return false;
+                        }
                         
-                        return false;
-                    }
-                    
-                    coa = new CoalescedSceneObjects(UUID.Zero);                    
-                    reader.Read();                                            
-                    
-                    while (reader.NodeType != XmlNodeType.EndElement && reader.Name != "CoalescedObject")
-                    {
-                        if (reader.Name == "SceneObjectGroup")
+                        coa = new CoalescedSceneObjects(UUID.Zero);                    
+                        reader.Read();                                            
+                        
+                        while (reader.NodeType != XmlNodeType.EndElement && reader.Name != "CoalescedObject")
                         {
-                            string soXml = reader.ReadOuterXml();
-                            coa.Add(SceneObjectSerializer.FromOriginalXmlFormat(soXml));
+                            if (reader.Name == "SceneObjectGroup")
+                            {
+                                string soXml = reader.ReadOuterXml();
+                                coa.Add(SceneObjectSerializer.FromOriginalXmlFormat(soXml));
+                            }
                         }
+                        
+                        reader.ReadEndElement(); // CoalescedObject
                     }
-                    
-                    reader.ReadEndElement(); // CoalescedObject
+                    catch (Exception e)
+                    {
+                        m_log.ErrorFormat(
+                            "[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed with {0} {1}", 
+                            e.Message, e.StackTrace);
+                        
+                        return false;
+                    }                        
                 }
             }