aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTeravus Ovares2008-09-06 19:40:04 +0000
committerTeravus Ovares2008-09-06 19:40:04 +0000
commita97155b10620686fbbeb67713888c1235eb099c2 (patch)
treecb77c373c3c9cdfee480feadbf84d1efa6b132da
parent* Fixes a few type changes that caused the XML Format to break. (diff)
downloadopensim-SC_OLD-a97155b10620686fbbeb67713888c1235eb099c2.zip
opensim-SC_OLD-a97155b10620686fbbeb67713888c1235eb099c2.tar.gz
opensim-SC_OLD-a97155b10620686fbbeb67713888c1235eb099c2.tar.bz2
opensim-SC_OLD-a97155b10620686fbbeb67713888c1235eb099c2.tar.xz
* Addresses the same issue as last commit on SceneObjectGroup border crossings
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs8
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 709e0b3..ffbef8a 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -410,6 +410,14 @@ namespace OpenSim.Region.Environment.Scenes
410 /// </summary> 410 /// </summary>
411 public SceneObjectGroup(string xmlData) 411 public SceneObjectGroup(string xmlData)
412 { 412 {
413 // libomv.types changes UUID to Guid
414 xmlData = xmlData.Replace("<UUID>", "<Guid>");
415 xmlData = xmlData.Replace("</UUID>", "</Guid>");
416
417 // Handle Nested <UUID><UUID> property
418 xmlData = xmlData.Replace("<Guid><Guid>", "<UUID><Guid>");
419 xmlData = xmlData.Replace("</Guid></Guid>", "</Guid></UUID>");
420
413 StringReader sr = new StringReader(xmlData); 421 StringReader sr = new StringReader(xmlData);
414 XmlTextReader reader = new XmlTextReader(sr); 422 XmlTextReader reader = new XmlTextReader(sr);
415 reader.Read(); 423 reader.Read();