aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Tests
diff options
context:
space:
mode:
authorMelanie2011-10-12 07:05:18 +0100
committerMelanie2011-10-12 07:05:18 +0100
commitabfb0c93995e817625df257b0b106cb6f9e0f2b5 (patch)
treecedeec407fbacdffa4b5eb0833297d8c475962d8 /OpenSim/Region/Framework/Scenes/Tests
parentMerge commit '1f78dc65041729567edc411a3e63dd9a32a268a3' into bigmerge (diff)
parentRefactored "known child region" in ScenePresence. There were 4 different (diff)
downloadopensim-SC_OLD-abfb0c93995e817625df257b0b106cb6f9e0f2b5.zip
opensim-SC_OLD-abfb0c93995e817625df257b0b106cb6f9e0f2b5.tar.gz
opensim-SC_OLD-abfb0c93995e817625df257b0b106cb6f9e0f2b5.tar.bz2
opensim-SC_OLD-abfb0c93995e817625df257b0b106cb6f9e0f2b5.tar.xz
Merge commit '4748c19bdbcdcaf6050e1f04a5f7394a88e0bf3e' into bigmerge
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Tests')
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs11
1 files changed, 4 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
index ce9d418..119eb1f 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
@@ -215,11 +215,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
215 string cap = presence.ControllingClient.RequestClientInfo().CapsPath; 215 string cap = presence.ControllingClient.RequestClientInfo().CapsPath;
216 216
217 presence.AddNeighbourRegion(region2, cap); 217 presence.AddNeighbourRegion(region2, cap);
218 presence.AddNeighbourRegion(region3, cap); 218 presence.AddNeighbourRegion(region3, cap);
219 219
220 List<ulong> neighbours = presence.GetKnownRegionList(); 220 Assert.That(presence.KnownRegionCount, Is.EqualTo(2));
221
222 Assert.That(neighbours.Count, Is.EqualTo(2));
223 } 221 }
224 222
225 [Test] 223 [Test]
@@ -230,8 +228,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
230 ScenePresence presence = scene.GetScenePresence(agent1); 228 ScenePresence presence = scene.GetScenePresence(agent1);
231 presence.RemoveNeighbourRegion(region3); 229 presence.RemoveNeighbourRegion(region3);
232 230
233 List<ulong> neighbours = presence.GetKnownRegionList(); 231 Assert.That(presence.KnownRegionCount,Is.EqualTo(1));
234 Assert.That(neighbours.Count,Is.EqualTo(1));
235 /* 232 /*
236 presence.MakeChildAgent; 233 presence.MakeChildAgent;
237 presence.MakeRootAgent; 234 presence.MakeRootAgent;