* 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

@@ -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

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;