Dump OpenSim 0.9.0.1 into it's own branch.

1 files changed, 16 insertions, 14 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
index f45158b..abcb573 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
@@ -78,7 +78,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                     List<SceneObjectGroup> coaObjects = coa.Objects;
 
 //                    m_log.DebugFormat(
-//                        "[COALESCED SCENE OBJECTS SERIALIZER]: Writing {0} objects for coalesced object", 
+//                        "[COALESCED SCENE OBJECTS SERIALIZER]: Writing {0} objects for coalesced object",
 //                        coaObjects.Count);
 
                     // This is weak - we're relying on the set of coalesced objects still being identical
@@ -86,9 +86,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
 
                     writer.WriteStartElement("CoalescedObject");
 
-                    writer.WriteAttributeString("x", size.X.ToString());
-                    writer.WriteAttributeString("y", size.Y.ToString());
-                    writer.WriteAttributeString("z", size.Z.ToString());
+                    writer.WriteAttributeString("x", size.X.ToString(Culture.FormatProvider));
+                    writer.WriteAttributeString("y", size.Y.ToString(Culture.FormatProvider));
+                    writer.WriteAttributeString("z", size.Z.ToString(Culture.FormatProvider));
 
                     // Embed the offsets into the group XML
                     for (int i = 0; i < coaObjects.Count; i++)
@@ -96,13 +96,13 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                         SceneObjectGroup obj = coaObjects[i];
 
 //                        m_log.DebugFormat(
-//                            "[COALESCED SCENE OBJECTS SERIALIZER]: Writing offset for object {0}, {1}", 
+//                            "[COALESCED SCENE OBJECTS SERIALIZER]: Writing offset for object {0}, {1}",
 //                            i, obj.Name);
 
                         writer.WriteStartElement("SceneObjectGroup");
-                        writer.WriteAttributeString("offsetx", offsets[i].X.ToString());
-                        writer.WriteAttributeString("offsety", offsets[i].Y.ToString());
-                        writer.WriteAttributeString("offsetz", offsets[i].Z.ToString());
+                        writer.WriteAttributeString("offsetx", offsets[i].X.ToString(Culture.FormatProvider));
+                        writer.WriteAttributeString("offsety", offsets[i].Y.ToString(Culture.FormatProvider));
+                        writer.WriteAttributeString("offsetz", offsets[i].Z.ToString(Culture.FormatProvider));
 
                         SceneObjectSerializer.ToOriginalXmlFormat(obj, writer, doScriptStates);
 
@@ -133,12 +133,14 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                 {
                     using (XmlTextReader reader = new XmlTextReader(sr))
                     {
+                        reader.ProhibitDtd = true;
+
                         reader.MoveToContent(); // skip possible xml declaration
 
                         if (reader.Name != "CoalescedObject")
                         {
     //                        m_log.DebugFormat(
-    //                            "[COALESCED SCENE OBJECTS SERIALIZER]: TryFromXml() root element was {0} so returning false", 
+    //                            "[COALESCED SCENE OBJECTS SERIALIZER]: TryFromXml() root element was {0} so returning false",
     //                            reader.Name);
 
                             return false;
@@ -147,6 +149,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                 }
 
                 XmlDocument doc = new XmlDocument();
+                doc.XmlResolver=null;
                 doc.LoadXml(xml);
                 XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject");
                 if (e == null)
@@ -166,10 +169,10 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                     }
                     else
                     {
-                        // XXX: Possibly we should fail outright here rather than continuing if a particular component of the 
+                        // XXX: Possibly we should fail outright here rather than continuing if a particular component of the
                         // coalesced object fails to load.
                         m_log.WarnFormat(
-                            "[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml for component {0} failed.  Continuing.", 
+                            "[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml for component {0} failed.  Continuing.",
                             i);
                     }
 
@@ -178,9 +181,8 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             }
             catch (Exception e)
             {
-                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);
+                m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed ",  e);
+                Util.LogFailedXML("[COALESCED SCENE OBJECTS SERIALIZER]:", xml);
                 return false;
             }