aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Tests
diff options
context:
space:
mode:
authorKevin Cozens2015-09-21 10:58:35 -0400
committerKevin Cozens2015-09-21 11:00:34 -0400
commitb412db72be9c7a3833550119ba4d1c04b995d188 (patch)
tree506ca226d36275d9e802249d1bf1f7cbeee6eee4 /OpenSim/Region/Framework/Scenes/Tests
parentcoment out lludp debug things that only fill up the help screen (diff)
downloadopensim-SC_OLD-b412db72be9c7a3833550119ba4d1c04b995d188.zip
opensim-SC_OLD-b412db72be9c7a3833550119ba4d1c04b995d188.tar.gz
opensim-SC_OLD-b412db72be9c7a3833550119ba4d1c04b995d188.tar.bz2
opensim-SC_OLD-b412db72be9c7a3833550119ba4d1c04b995d188.tar.xz
Fix a regression to GetSittingAvatars(). Return List<ScenePresence> once more.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Tests')
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs
index 64f11cd..8b194e6 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs
@@ -98,9 +98,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
98 98
99 Assert.That(part.SitTargetAvatar, Is.EqualTo(UUID.Zero)); 99 Assert.That(part.SitTargetAvatar, Is.EqualTo(UUID.Zero));
100 Assert.That(part.GetSittingAvatarsCount(), Is.EqualTo(1)); 100 Assert.That(part.GetSittingAvatarsCount(), Is.EqualTo(1));
101 HashSet<UUID> sittingAvatars = part.GetSittingAvatars(); 101 HashSet<ScenePresence> sittingAvatars = part.GetSittingAvatars();
102 Assert.That(sittingAvatars.Count, Is.EqualTo(1)); 102 Assert.That(sittingAvatars.Count, Is.EqualTo(1));
103 Assert.That(sittingAvatars.Contains(m_sp.UUID)); 103 Assert.That(sittingAvatars.Contains(m_sp));
104 Assert.That(m_sp.ParentID, Is.EqualTo(part.LocalId)); 104 Assert.That(m_sp.ParentID, Is.EqualTo(part.LocalId));
105 } 105 }
106 106
@@ -210,9 +210,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
210 Assert.That(m_sp.PhysicsActor, Is.Null); 210 Assert.That(m_sp.PhysicsActor, Is.Null);
211 211
212 Assert.That(part.GetSittingAvatarsCount(), Is.EqualTo(1)); 212 Assert.That(part.GetSittingAvatarsCount(), Is.EqualTo(1));
213 HashSet<UUID> sittingAvatars = part.GetSittingAvatars(); 213 HashSet<ScenePresence> sittingAvatars = part.GetSittingAvatars();
214 Assert.That(sittingAvatars.Count, Is.EqualTo(1)); 214 Assert.That(sittingAvatars.Count, Is.EqualTo(1));
215 Assert.That(sittingAvatars.Contains(m_sp.UUID)); 215 Assert.That(sittingAvatars.Contains(m_sp));
216 216
217 m_sp.StandUp(); 217 m_sp.StandUp();
218 218
@@ -246,4 +246,4 @@ namespace OpenSim.Region.Framework.Scenes.Tests
246 Assert.That(m_sp.PhysicsActor, Is.Not.Null); 246 Assert.That(m_sp.PhysicsActor, Is.Not.Null);
247 } 247 }
248 } 248 }
249} \ No newline at end of file 249}