aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorTeravus Ovares2008-09-06 19:21:41 +0000
committerTeravus Ovares2008-09-06 19:21:41 +0000
commit6fc23adbc29dddbfdc6edde780d128c27ee4cf4b (patch)
tree50c9f9c9c9c954469b858ea459c39f69d818180f /OpenSim/Region/Environment
parentBrushing rust of ye old commit (diff)
downloadopensim-SC_OLD-6fc23adbc29dddbfdc6edde780d128c27ee4cf4b.zip
opensim-SC_OLD-6fc23adbc29dddbfdc6edde780d128c27ee4cf4b.tar.gz
opensim-SC_OLD-6fc23adbc29dddbfdc6edde780d128c27ee4cf4b.tar.bz2
opensim-SC_OLD-6fc23adbc29dddbfdc6edde780d128c27ee4cf4b.tar.xz
* 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.
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs2
2 files changed, 7 insertions, 1 deletions
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
348 { 348 {
349 m_scene = scene; 349 m_scene = scene;
350 m_regionHandle = regionHandle; 350 m_regionHandle = regionHandle;
351 // libomv.types changes UUID to Guid
352 xmlData = xmlData.Replace("<UUID>", "<Guid>");
353 xmlData = xmlData.Replace("</UUID>", "</Guid>");
351 354
355 // Handle Nested <UUID><UUID> property
356 xmlData = xmlData.Replace("<Guid><Guid>", "<UUID><Guid>");
357 xmlData = xmlData.Replace("</Guid></Guid>", "</Guid></UUID>");
352 StringReader sr = new StringReader(xmlData); 358 StringReader sr = new StringReader(xmlData);
353 XmlTextReader reader = new XmlTextReader(sr); 359 XmlTextReader reader = new XmlTextReader(sr);
354 try 360 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
1314 public static SceneObjectPart FromXml(XmlReader xmlReader) 1314 public static SceneObjectPart FromXml(XmlReader xmlReader)
1315 { 1315 {
1316 // It's not necessary to persist this 1316 // It's not necessary to persist this
1317 1317
1318 XmlSerializer serializer = new XmlSerializer(typeof (SceneObjectPart)); 1318 XmlSerializer serializer = new XmlSerializer(typeof (SceneObjectPart));
1319 SceneObjectPart newobject = (SceneObjectPart) serializer.Deserialize(xmlReader); 1319 SceneObjectPart newobject = (SceneObjectPart) serializer.Deserialize(xmlReader);
1320 return newobject; 1320 return newobject;