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
---
 .../Serialization/Tests/RegionSettingsSerializerTests.cs          | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'OpenSim/Framework/Serialization/Tests')

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
     <FixedSun>true</FixedSun>
     <SunPosition>12</SunPosition>
   </Terrain>
-  <Telehub>
-    <TelehubObject>00000000-0000-0000-0000-111111111111</TelehubObject>
-    <SpawnPoint>1,-2,0.33</SpawnPoint>
-  </Telehub>
 </RegionSettings>";
 
         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