From 8b958e7e74d8e4b462c6a59c2854c5072ff8c746 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 12 May 2012 02:36:56 +0100
Subject: Revert "Save the Telehub and its Spawn Points in the OAR"
This reverts commit b0b7b45b943dd94546bcfcf5d3bb871cfe35b507.
Sorry BlueWall, I wanted to discuss an aspect of the data storage but I couldn't assign bugs in 'patch included' state to myself until I changed mantis just now and I forgot to mention it on irc.
I wouldn't normally revert but thinks get tricky when it comes to data formats.
Essentially, I would like to see the Yaw, Pitch and Distance values as separate XML entities (as used in other aspects such as vectors, quaternions) rather than as a . delimited string
We can discuss this more with Oren in opensimulator.org/mantis/view.php?id=6008
---
OpenSim/Framework/RegionSettings.cs | 29 +----------------
.../External/RegionSettingsSerializer.cs | 37 ++--------------------
.../Tests/RegionSettingsSerializerTests.cs | 8 -----
3 files changed, 3 insertions(+), 71 deletions(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs
index 011a97a..4ce3392 100644
--- a/OpenSim/Framework/RegionSettings.cs
+++ b/OpenSim/Framework/RegionSettings.cs
@@ -29,7 +29,6 @@ using System;
using System.Collections.Generic;
using System.IO;
using OpenMetaverse;
-using System.Runtime.Serialization;
namespace OpenSim.Framework
{
@@ -72,32 +71,6 @@ namespace OpenSim.Framework
return pos + offset;
}
-
- ///
- /// Returns a string representation of this SpawnPoint.
- ///
- ///
- public override string ToString()
- {
- return string.Format("{0},{1},{2}", Yaw, Pitch, Distance);
- }
-
- ///
- /// Generate a SpawnPoint from a string
- ///
- ///
- public static SpawnPoint Parse(string str)
- {
- string[] parts = str.Split(',');
- if (parts.Length != 3)
- throw new ArgumentException("Invalid string: " + str);
-
- SpawnPoint sp = new SpawnPoint();
- sp.Yaw = float.Parse(parts[0]);
- sp.Pitch = float.Parse(parts[1]);
- sp.Distance = float.Parse(parts[2]);
- return sp;
- }
}
public class RegionSettings
@@ -483,7 +456,7 @@ namespace OpenSim.Framework
}
// Connected Telehub object
- private UUID m_TelehubObject = UUID.Zero;
+ private UUID m_TelehubObject;
public UUID TelehubObject
{
get
diff --git a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
index f18435d..931898c 100644
--- a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
@@ -30,8 +30,6 @@ using System.Text;
using System.Xml;
using OpenMetaverse;
using OpenSim.Framework;
-using log4net;
-using System.Reflection;
namespace OpenSim.Framework.Serialization.External
{
@@ -189,29 +187,7 @@ namespace OpenSim.Framework.Serialization.External
break;
}
}
-
- xtr.ReadEndElement();
-
- if (xtr.IsStartElement("Telehub"))
- {
- xtr.ReadStartElement("Telehub");
-
- while (xtr.Read() && xtr.NodeType != XmlNodeType.EndElement)
- {
- switch (xtr.Name)
- {
- case "TelehubObject":
- settings.TelehubObject = UUID.Parse(xtr.ReadElementContentAsString());
- break;
- case "SpawnPoint":
- string str = xtr.ReadElementContentAsString();
- SpawnPoint sp = SpawnPoint.Parse(str);
- settings.AddSpawnPoint(sp);
- break;
- }
- }
- }
-
+
xtr.Close();
sr.Close();
@@ -267,16 +243,7 @@ namespace OpenSim.Framework.Serialization.External
xtw.WriteElementString("SunPosition", settings.SunPosition.ToString());
// Note: 'SunVector' isn't saved because this value is owned by the Sun Module, which
// calculates it automatically according to the date and other factors.
- xtw.WriteEndElement();
-
- xtw.WriteStartElement("Telehub");
- if (settings.TelehubObject != UUID.Zero)
- {
- xtw.WriteElementString("TelehubObject", settings.TelehubObject.ToString());
- foreach (SpawnPoint sp in settings.SpawnPoints())
- xtw.WriteElementString("SpawnPoint", sp.ToString());
- }
- xtw.WriteEndElement();
+ xtw.WriteEndElement();
xtw.WriteEndElement();
diff --git a/OpenSim/Framework/Serialization/Tests/RegionSettingsSerializerTests.cs b/OpenSim/Framework/Serialization/Tests/RegionSettingsSerializerTests.cs
index 09b6f6d..a61e4af 100644
--- a/OpenSim/Framework/Serialization/Tests/RegionSettingsSerializerTests.cs
+++ b/OpenSim/Framework/Serialization/Tests/RegionSettingsSerializerTests.cs
@@ -78,10 +78,6 @@ namespace OpenSim.Framework.Serialization.Tests
true
12
-
- 00000000-0000-0000-0000-111111111111
- 1,-2,0.33
-
";
private RegionSettings m_rs;
@@ -120,8 +116,6 @@ namespace OpenSim.Framework.Serialization.Tests
m_rs.TerrainTexture4 = UUID.Parse("00000000-0000-0000-0000-000000000080");
m_rs.UseEstateSun = true;
m_rs.WaterHeight = 23;
- m_rs.TelehubObject = UUID.Parse("00000000-0000-0000-0000-111111111111");
- m_rs.AddSpawnPoint(SpawnPoint.Parse("1,-2,0.33"));
}
[Test]
@@ -135,8 +129,6 @@ namespace OpenSim.Framework.Serialization.Tests
Assert.That(deserRs.TerrainTexture2, Is.EqualTo(m_rs.TerrainTexture2));
Assert.That(deserRs.DisablePhysics, Is.EqualTo(m_rs.DisablePhysics));
Assert.That(deserRs.TerrainLowerLimit, Is.EqualTo(m_rs.TerrainLowerLimit));
- Assert.That(deserRs.TelehubObject, Is.EqualTo(m_rs.TelehubObject));
- Assert.That(deserRs.SpawnPoints()[0].ToString(), Is.EqualTo(m_rs.SpawnPoints()[0].ToString()));
}
}
}
--
cgit v1.1