From 6fc23adbc29dddbfdc6edde780d128c27ee4cf4b Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Sat, 6 Sep 2008 19:21:41 +0000
Subject: * Fixes a few type changes that caused the XML Format to break. *
 Testers, please try rezzing your inventory on this revision and sending me
 feedback in mantis. * Users, it's not time to update yet.  The dust still
 hasn't settled.

---
 OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 6 ++++++
 OpenSim/Region/Environment/Scenes/SceneObjectPart.cs  | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Environment/Scenes')

diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index d465eaa..709e0b3 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -348,7 +348,13 @@ namespace OpenSim.Region.Environment.Scenes
         {
             m_scene = scene;
             m_regionHandle = regionHandle;
+            // libomv.types changes UUID to Guid
+            xmlData = xmlData.Replace("<UUID>", "<Guid>");
+            xmlData = xmlData.Replace("</UUID>", "</Guid>");
 
+            // Handle Nested <UUID><UUID> property
+            xmlData = xmlData.Replace("<Guid><Guid>", "<UUID><Guid>");
+            xmlData = xmlData.Replace("</Guid></Guid>", "</Guid></UUID>");
             StringReader sr = new StringReader(xmlData);
             XmlTextReader reader = new XmlTextReader(sr);
             try
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index ea10fe6..f8e8c9f 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -1314,7 +1314,7 @@ namespace OpenSim.Region.Environment.Scenes
         public static SceneObjectPart FromXml(XmlReader xmlReader)
         {
             // It's not necessary to persist this
-
+            
             XmlSerializer serializer = new XmlSerializer(typeof (SceneObjectPart));
             SceneObjectPart newobject = (SceneObjectPart) serializer.Deserialize(xmlReader);
             return newobject;
-- 
cgit v1.1