aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Tests
diff options
context:
space:
mode:
authorMelanie2011-10-12 07:05:47 +0100
committerMelanie2011-10-12 07:05:47 +0100
commit00285082d82a7a5b3d7a5e4f8f3ac6c56b431363 (patch)
treeed57db090dd909f59f11af628bed9ae0a0d85747 /OpenSim/Region/Framework/Scenes/Tests
parentMerge commit 'f26a966b8e79688ca2ed81c236492d694f34ac7d' into bigmerge (diff)
parentFixed line endings from previous commit (diff)
downloadopensim-SC-00285082d82a7a5b3d7a5e4f8f3ac6c56b431363.zip
opensim-SC-00285082d82a7a5b3d7a5e4f8f3ac6c56b431363.tar.gz
opensim-SC-00285082d82a7a5b3d7a5e4f8f3ac6c56b431363.tar.bz2
opensim-SC-00285082d82a7a5b3d7a5e4f8f3ac6c56b431363.tar.xz
Merge commit '4b46b7a5adb1c7449725ed1cf1fa5d7122af10bb' into bigmerge
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Tests')
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
index 119eb1f..f0bbf0b 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
@@ -215,8 +215,8 @@ 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 Assert.That(presence.KnownRegionCount, Is.EqualTo(2)); 220 Assert.That(presence.KnownRegionCount, Is.EqualTo(2));
221 } 221 }
222 222