diff options
author | Justin Clark-Casey (justincc) | 2011-04-02 01:13:10 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-04-02 01:13:10 +0100 |
commit | 2c86f6ba7ddcf4816618db5b19a8ca111a8425b5 (patch) | |
tree | c58c839436f70f3990b334975e6babe7edfb08c9 /OpenSim/Region/CoreModules/World/Land | |
parent | If the land has no group ownership (it is UUID.Zero) then don't put prims in ... (diff) | |
download | opensim-SC_OLD-2c86f6ba7ddcf4816618db5b19a8ca111a8425b5.zip opensim-SC_OLD-2c86f6ba7ddcf4816618db5b19a8ca111a8425b5.tar.gz opensim-SC_OLD-2c86f6ba7ddcf4816618db5b19a8ca111a8425b5.tar.bz2 opensim-SC_OLD-2c86f6ba7ddcf4816618db5b19a8ca111a8425b5.tar.xz |
refactor: rename m_dummyUserId to m_otherUserId
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs b/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs index 521effc..49ad705 100644 --- a/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs +++ b/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs | |||
@@ -45,7 +45,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests | |||
45 | public class PrimCountModuleTests | 45 | public class PrimCountModuleTests |
46 | { | 46 | { |
47 | protected UUID m_userId = new UUID("00000000-0000-0000-0000-100000000000"); | 47 | protected UUID m_userId = new UUID("00000000-0000-0000-0000-100000000000"); |
48 | protected UUID m_dummyUserId = new UUID("99999999-9999-9999-9999-999999999999"); | 48 | protected UUID m_otherUserId = new UUID("99999999-9999-9999-9999-999999999999"); |
49 | protected TestScene m_scene; | 49 | protected TestScene m_scene; |
50 | protected PrimCountModule m_pcm; | 50 | protected PrimCountModule m_pcm; |
51 | protected ILandObject m_lo; | 51 | protected ILandObject m_lo; |
@@ -81,7 +81,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests | |||
81 | Assert.That(pc.Total, Is.EqualTo(0)); | 81 | Assert.That(pc.Total, Is.EqualTo(0)); |
82 | Assert.That(pc.Selected, Is.EqualTo(0)); | 82 | Assert.That(pc.Selected, Is.EqualTo(0)); |
83 | Assert.That(pc.Users[m_userId], Is.EqualTo(0)); | 83 | Assert.That(pc.Users[m_userId], Is.EqualTo(0)); |
84 | Assert.That(pc.Users[m_dummyUserId], Is.EqualTo(0)); | 84 | Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0)); |
85 | Assert.That(pc.Simulator, Is.EqualTo(0)); | 85 | Assert.That(pc.Simulator, Is.EqualTo(0)); |
86 | 86 | ||
87 | SceneObjectGroup sog = SceneSetupHelpers.CreateSceneObject(3, m_userId, 0x01); | 87 | SceneObjectGroup sog = SceneSetupHelpers.CreateSceneObject(3, m_userId, 0x01); |
@@ -93,7 +93,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests | |||
93 | Assert.That(pc.Total, Is.EqualTo(3)); | 93 | Assert.That(pc.Total, Is.EqualTo(3)); |
94 | Assert.That(pc.Selected, Is.EqualTo(0)); | 94 | Assert.That(pc.Selected, Is.EqualTo(0)); |
95 | Assert.That(pc.Users[m_userId], Is.EqualTo(3)); | 95 | Assert.That(pc.Users[m_userId], Is.EqualTo(3)); |
96 | Assert.That(pc.Users[m_dummyUserId], Is.EqualTo(0)); | 96 | Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0)); |
97 | Assert.That(pc.Simulator, Is.EqualTo(3)); | 97 | Assert.That(pc.Simulator, Is.EqualTo(3)); |
98 | 98 | ||
99 | // Add a second object and retest | 99 | // Add a second object and retest |
@@ -106,7 +106,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests | |||
106 | Assert.That(pc.Total, Is.EqualTo(5)); | 106 | Assert.That(pc.Total, Is.EqualTo(5)); |
107 | Assert.That(pc.Selected, Is.EqualTo(0)); | 107 | Assert.That(pc.Selected, Is.EqualTo(0)); |
108 | Assert.That(pc.Users[m_userId], Is.EqualTo(5)); | 108 | Assert.That(pc.Users[m_userId], Is.EqualTo(5)); |
109 | Assert.That(pc.Users[m_dummyUserId], Is.EqualTo(0)); | 109 | Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0)); |
110 | Assert.That(pc.Simulator, Is.EqualTo(5)); | 110 | Assert.That(pc.Simulator, Is.EqualTo(5)); |
111 | } | 111 | } |
112 | 112 | ||
@@ -131,7 +131,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests | |||
131 | Assert.That(pc.Total, Is.EqualTo(6)); | 131 | Assert.That(pc.Total, Is.EqualTo(6)); |
132 | Assert.That(pc.Selected, Is.EqualTo(0)); | 132 | Assert.That(pc.Selected, Is.EqualTo(0)); |
133 | Assert.That(pc.Users[m_userId], Is.EqualTo(6)); | 133 | Assert.That(pc.Users[m_userId], Is.EqualTo(6)); |
134 | Assert.That(pc.Users[m_dummyUserId], Is.EqualTo(0)); | 134 | Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0)); |
135 | Assert.That(pc.Simulator, Is.EqualTo(6)); | 135 | Assert.That(pc.Simulator, Is.EqualTo(6)); |
136 | } | 136 | } |
137 | 137 | ||
@@ -157,7 +157,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests | |||
157 | Assert.That(pc.Total, Is.EqualTo(1)); | 157 | Assert.That(pc.Total, Is.EqualTo(1)); |
158 | Assert.That(pc.Selected, Is.EqualTo(0)); | 158 | Assert.That(pc.Selected, Is.EqualTo(0)); |
159 | Assert.That(pc.Users[m_userId], Is.EqualTo(1)); | 159 | Assert.That(pc.Users[m_userId], Is.EqualTo(1)); |
160 | Assert.That(pc.Users[m_dummyUserId], Is.EqualTo(0)); | 160 | Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0)); |
161 | Assert.That(pc.Simulator, Is.EqualTo(1)); | 161 | Assert.That(pc.Simulator, Is.EqualTo(1)); |
162 | } | 162 | } |
163 | 163 | ||
@@ -169,7 +169,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests | |||
169 | 169 | ||
170 | IPrimCounts pc = m_lo.PrimCounts; | 170 | IPrimCounts pc = m_lo.PrimCounts; |
171 | 171 | ||
172 | SceneObjectGroup sog = SceneSetupHelpers.CreateSceneObject(3, m_dummyUserId, 0x01); | 172 | SceneObjectGroup sog = SceneSetupHelpers.CreateSceneObject(3, m_otherUserId, 0x01); |
173 | m_scene.AddNewSceneObject(sog, false); | 173 | m_scene.AddNewSceneObject(sog, false); |
174 | 174 | ||
175 | Assert.That(pc.Owner, Is.EqualTo(0)); | 175 | Assert.That(pc.Owner, Is.EqualTo(0)); |
@@ -178,7 +178,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests | |||
178 | Assert.That(pc.Total, Is.EqualTo(3)); | 178 | Assert.That(pc.Total, Is.EqualTo(3)); |
179 | Assert.That(pc.Selected, Is.EqualTo(0)); | 179 | Assert.That(pc.Selected, Is.EqualTo(0)); |
180 | Assert.That(pc.Users[m_userId], Is.EqualTo(0)); | 180 | Assert.That(pc.Users[m_userId], Is.EqualTo(0)); |
181 | Assert.That(pc.Users[m_dummyUserId], Is.EqualTo(3)); | 181 | Assert.That(pc.Users[m_otherUserId], Is.EqualTo(3)); |
182 | Assert.That(pc.Simulator, Is.EqualTo(3)); | 182 | Assert.That(pc.Simulator, Is.EqualTo(3)); |
183 | } | 183 | } |
184 | 184 | ||
@@ -202,7 +202,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests | |||
202 | Assert.That(pc.Total, Is.EqualTo(3)); | 202 | Assert.That(pc.Total, Is.EqualTo(3)); |
203 | Assert.That(pc.Selected, Is.EqualTo(0)); | 203 | Assert.That(pc.Selected, Is.EqualTo(0)); |
204 | Assert.That(pc.Users[m_userId], Is.EqualTo(3)); | 204 | Assert.That(pc.Users[m_userId], Is.EqualTo(3)); |
205 | Assert.That(pc.Users[m_dummyUserId], Is.EqualTo(0)); | 205 | Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0)); |
206 | Assert.That(pc.Simulator, Is.EqualTo(3)); | 206 | Assert.That(pc.Simulator, Is.EqualTo(3)); |
207 | } | 207 | } |
208 | } | 208 | } |