diff options
author | Justin Clark-Casey (justincc) | 2011-03-26 02:19:28 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-03-26 02:19:28 +0000 |
commit | 541cd3e8c84d3ccc13525206b1724ee931416a3c (patch) | |
tree | 51137fafbf9ea82b00fd230d219d49f76d5d43f6 /OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs | |
parent | When an object is duplicated, add the dupe to the uuid/local id indexes as we... (diff) | |
download | opensim-SC_OLD-541cd3e8c84d3ccc13525206b1724ee931416a3c.zip opensim-SC_OLD-541cd3e8c84d3ccc13525206b1724ee931416a3c.tar.gz opensim-SC_OLD-541cd3e8c84d3ccc13525206b1724ee931416a3c.tar.bz2 opensim-SC_OLD-541cd3e8c84d3ccc13525206b1724ee931416a3c.tar.xz |
move total parcel prim calculations into IPrimCounts instead of doing this in LLClientView
need to move selected prim counts from LandData/LMM still
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs b/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs index dd55f98..58bd841 100644 --- a/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs +++ b/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs | |||
@@ -78,9 +78,10 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests | |||
78 | Assert.That(pc.Owner, Is.EqualTo(0)); | 78 | Assert.That(pc.Owner, Is.EqualTo(0)); |
79 | Assert.That(pc.Group, Is.EqualTo(0)); | 79 | Assert.That(pc.Group, Is.EqualTo(0)); |
80 | Assert.That(pc.Others, Is.EqualTo(0)); | 80 | Assert.That(pc.Others, Is.EqualTo(0)); |
81 | Assert.That(pc.Total, Is.EqualTo(0)); | ||
81 | Assert.That(pc.Users[m_userId], Is.EqualTo(0)); | 82 | Assert.That(pc.Users[m_userId], Is.EqualTo(0)); |
82 | Assert.That(pc.Users[m_dummyUserId], Is.EqualTo(0)); | 83 | Assert.That(pc.Users[m_dummyUserId], Is.EqualTo(0)); |
83 | Assert.That(pc.Simulator, Is.EqualTo(0)); | 84 | Assert.That(pc.Simulator, Is.EqualTo(0)); |
84 | 85 | ||
85 | SceneObjectGroup sog = SceneSetupHelpers.CreateSceneObject(3, m_userId, 0x01); | 86 | SceneObjectGroup sog = SceneSetupHelpers.CreateSceneObject(3, m_userId, 0x01); |
86 | m_scene.AddNewSceneObject(sog, false); | 87 | m_scene.AddNewSceneObject(sog, false); |
@@ -88,6 +89,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests | |||
88 | Assert.That(pc.Owner, Is.EqualTo(3)); | 89 | Assert.That(pc.Owner, Is.EqualTo(3)); |
89 | Assert.That(pc.Group, Is.EqualTo(0)); | 90 | Assert.That(pc.Group, Is.EqualTo(0)); |
90 | Assert.That(pc.Others, Is.EqualTo(0)); | 91 | Assert.That(pc.Others, Is.EqualTo(0)); |
92 | Assert.That(pc.Total, Is.EqualTo(3)); | ||
91 | Assert.That(pc.Users[m_userId], Is.EqualTo(3)); | 93 | Assert.That(pc.Users[m_userId], Is.EqualTo(3)); |
92 | Assert.That(pc.Users[m_dummyUserId], Is.EqualTo(0)); | 94 | Assert.That(pc.Users[m_dummyUserId], Is.EqualTo(0)); |
93 | Assert.That(pc.Simulator, Is.EqualTo(3)); | 95 | Assert.That(pc.Simulator, Is.EqualTo(3)); |
@@ -99,6 +101,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests | |||
99 | Assert.That(pc.Owner, Is.EqualTo(5)); | 101 | Assert.That(pc.Owner, Is.EqualTo(5)); |
100 | Assert.That(pc.Group, Is.EqualTo(0)); | 102 | Assert.That(pc.Group, Is.EqualTo(0)); |
101 | Assert.That(pc.Others, Is.EqualTo(0)); | 103 | Assert.That(pc.Others, Is.EqualTo(0)); |
104 | Assert.That(pc.Total, Is.EqualTo(5)); | ||
102 | Assert.That(pc.Users[m_userId], Is.EqualTo(5)); | 105 | Assert.That(pc.Users[m_userId], Is.EqualTo(5)); |
103 | Assert.That(pc.Users[m_dummyUserId], Is.EqualTo(0)); | 106 | Assert.That(pc.Users[m_dummyUserId], Is.EqualTo(0)); |
104 | Assert.That(pc.Simulator, Is.EqualTo(5)); | 107 | Assert.That(pc.Simulator, Is.EqualTo(5)); |
@@ -122,6 +125,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests | |||
122 | Assert.That(pc.Owner, Is.EqualTo(6)); | 125 | Assert.That(pc.Owner, Is.EqualTo(6)); |
123 | Assert.That(pc.Group, Is.EqualTo(0)); | 126 | Assert.That(pc.Group, Is.EqualTo(0)); |
124 | Assert.That(pc.Others, Is.EqualTo(0)); | 127 | Assert.That(pc.Others, Is.EqualTo(0)); |
128 | Assert.That(pc.Total, Is.EqualTo(6)); | ||
125 | Assert.That(pc.Users[m_userId], Is.EqualTo(6)); | 129 | Assert.That(pc.Users[m_userId], Is.EqualTo(6)); |
126 | Assert.That(pc.Users[m_dummyUserId], Is.EqualTo(0)); | 130 | Assert.That(pc.Users[m_dummyUserId], Is.EqualTo(0)); |
127 | Assert.That(pc.Simulator, Is.EqualTo(6)); | 131 | Assert.That(pc.Simulator, Is.EqualTo(6)); |
@@ -146,6 +150,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests | |||
146 | Assert.That(pc.Owner, Is.EqualTo(1)); | 150 | Assert.That(pc.Owner, Is.EqualTo(1)); |
147 | Assert.That(pc.Group, Is.EqualTo(0)); | 151 | Assert.That(pc.Group, Is.EqualTo(0)); |
148 | Assert.That(pc.Others, Is.EqualTo(0)); | 152 | Assert.That(pc.Others, Is.EqualTo(0)); |
153 | Assert.That(pc.Total, Is.EqualTo(1)); | ||
149 | Assert.That(pc.Users[m_userId], Is.EqualTo(1)); | 154 | Assert.That(pc.Users[m_userId], Is.EqualTo(1)); |
150 | Assert.That(pc.Users[m_dummyUserId], Is.EqualTo(0)); | 155 | Assert.That(pc.Users[m_dummyUserId], Is.EqualTo(0)); |
151 | Assert.That(pc.Simulator, Is.EqualTo(1)); | 156 | Assert.That(pc.Simulator, Is.EqualTo(1)); |
@@ -168,6 +173,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests | |||
168 | Assert.That(pc.Owner, Is.EqualTo(3)); | 173 | Assert.That(pc.Owner, Is.EqualTo(3)); |
169 | Assert.That(pc.Group, Is.EqualTo(0)); | 174 | Assert.That(pc.Group, Is.EqualTo(0)); |
170 | Assert.That(pc.Others, Is.EqualTo(0)); | 175 | Assert.That(pc.Others, Is.EqualTo(0)); |
176 | Assert.That(pc.Total, Is.EqualTo(3)); | ||
171 | Assert.That(pc.Users[m_userId], Is.EqualTo(3)); | 177 | Assert.That(pc.Users[m_userId], Is.EqualTo(3)); |
172 | Assert.That(pc.Users[m_dummyUserId], Is.EqualTo(0)); | 178 | Assert.That(pc.Users[m_dummyUserId], Is.EqualTo(0)); |
173 | Assert.That(pc.Simulator, Is.EqualTo(3)); | 179 | Assert.That(pc.Simulator, Is.EqualTo(3)); |