diff options
author | Justin Clark-Casey (justincc) | 2012-05-12 02:36:56 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-05-12 02:36:56 +0100 |
commit | 8b958e7e74d8e4b462c6a59c2854c5072ff8c746 (patch) | |
tree | 391e872861713771078d6706fe49b16b94ece9ff /OpenSim/Framework/Serialization/Tests | |
parent | Save the Telehub and its Spawn Points in the OAR (diff) | |
download | opensim-SC_OLD-8b958e7e74d8e4b462c6a59c2854c5072ff8c746.zip opensim-SC_OLD-8b958e7e74d8e4b462c6a59c2854c5072ff8c746.tar.gz opensim-SC_OLD-8b958e7e74d8e4b462c6a59c2854c5072ff8c746.tar.bz2 opensim-SC_OLD-8b958e7e74d8e4b462c6a59c2854c5072ff8c746.tar.xz |
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
Diffstat (limited to 'OpenSim/Framework/Serialization/Tests')
-rw-r--r-- | OpenSim/Framework/Serialization/Tests/RegionSettingsSerializerTests.cs | 8 |
1 files changed, 0 insertions, 8 deletions
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 | |||
78 | <FixedSun>true</FixedSun> | 78 | <FixedSun>true</FixedSun> |
79 | <SunPosition>12</SunPosition> | 79 | <SunPosition>12</SunPosition> |
80 | </Terrain> | 80 | </Terrain> |
81 | <Telehub> | ||
82 | <TelehubObject>00000000-0000-0000-0000-111111111111</TelehubObject> | ||
83 | <SpawnPoint>1,-2,0.33</SpawnPoint> | ||
84 | </Telehub> | ||
85 | </RegionSettings>"; | 81 | </RegionSettings>"; |
86 | 82 | ||
87 | private RegionSettings m_rs; | 83 | private RegionSettings m_rs; |
@@ -120,8 +116,6 @@ namespace OpenSim.Framework.Serialization.Tests | |||
120 | m_rs.TerrainTexture4 = UUID.Parse("00000000-0000-0000-0000-000000000080"); | 116 | m_rs.TerrainTexture4 = UUID.Parse("00000000-0000-0000-0000-000000000080"); |
121 | m_rs.UseEstateSun = true; | 117 | m_rs.UseEstateSun = true; |
122 | m_rs.WaterHeight = 23; | 118 | m_rs.WaterHeight = 23; |
123 | m_rs.TelehubObject = UUID.Parse("00000000-0000-0000-0000-111111111111"); | ||
124 | m_rs.AddSpawnPoint(SpawnPoint.Parse("1,-2,0.33")); | ||
125 | } | 119 | } |
126 | 120 | ||
127 | [Test] | 121 | [Test] |
@@ -135,8 +129,6 @@ namespace OpenSim.Framework.Serialization.Tests | |||
135 | Assert.That(deserRs.TerrainTexture2, Is.EqualTo(m_rs.TerrainTexture2)); | 129 | Assert.That(deserRs.TerrainTexture2, Is.EqualTo(m_rs.TerrainTexture2)); |
136 | Assert.That(deserRs.DisablePhysics, Is.EqualTo(m_rs.DisablePhysics)); | 130 | Assert.That(deserRs.DisablePhysics, Is.EqualTo(m_rs.DisablePhysics)); |
137 | Assert.That(deserRs.TerrainLowerLimit, Is.EqualTo(m_rs.TerrainLowerLimit)); | 131 | Assert.That(deserRs.TerrainLowerLimit, Is.EqualTo(m_rs.TerrainLowerLimit)); |
138 | Assert.That(deserRs.TelehubObject, Is.EqualTo(m_rs.TelehubObject)); | ||
139 | Assert.That(deserRs.SpawnPoints()[0].ToString(), Is.EqualTo(m_rs.SpawnPoints()[0].ToString())); | ||
140 | } | 132 | } |
141 | } | 133 | } |
142 | } | 134 | } |