refactor: Use m_sittingAvatars to maintain the list of sitting avatars instead of two independent structures that do exactly the same thing

m_sittingAvatars code also already properly handles locking to avoid races.

2 files changed, 4 insertions, 6 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCrossingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCrossingTests.cs
index d65b0b6..969f73d 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCrossingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCrossingTests.cs
@@ -172,7 +172,6 @@ namespace OpenSim.Region.Framework.Scenes.Tests
                 so1PostCross = sceneB.GetSceneObjectGroup(so1Id);
                 Assert.NotNull(so1PostCross);
                 Assert.AreEqual(1, so1PostCross.GetSittingAvatarsCount());
-                Assert.AreEqual(1, so1PostCross.GetLinkedAvatars().Count);
             }
 
             Vector3 so1PostCrossPos = so1PostCross.AbsolutePosition;
@@ -198,7 +197,6 @@ namespace OpenSim.Region.Framework.Scenes.Tests
                 SceneObjectGroup so1PostReCross = sceneA.GetSceneObjectGroup(so1Id);
                 Assert.NotNull(so1PostReCross);
                 Assert.AreEqual(1, so1PostReCross.GetSittingAvatarsCount());
-                Assert.AreEqual(1, so1PostReCross.GetLinkedAvatars().Count);
             }
         }
 
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs
index 0911f00..dcdec5c 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs
@@ -93,9 +93,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             Assert.That(part.SitTargetAvatar, Is.EqualTo(UUID.Zero));
             Assert.That(part.GetSittingAvatarsCount(), Is.EqualTo(1));
-            HashSet<UUID> sittingAvatars = part.GetSittingAvatars();
+            HashSet<ScenePresence> sittingAvatars = part.GetSittingAvatars();
             Assert.That(sittingAvatars.Count, Is.EqualTo(1));
-            Assert.That(sittingAvatars.Contains(m_sp.UUID));
+            Assert.That(sittingAvatars.Contains(m_sp));
             Assert.That(m_sp.ParentID, Is.EqualTo(part.LocalId));
         }
 
@@ -151,9 +151,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             Assert.That(m_sp.PhysicsActor, Is.Null);
 
             Assert.That(part.GetSittingAvatarsCount(), Is.EqualTo(1));
-            HashSet<UUID> sittingAvatars = part.GetSittingAvatars();
+            HashSet<ScenePresence> sittingAvatars = part.GetSittingAvatars();
             Assert.That(sittingAvatars.Count, Is.EqualTo(1));
-            Assert.That(sittingAvatars.Contains(m_sp.UUID));
+            Assert.That(sittingAvatars.Contains(m_sp));
 
             m_sp.StandUp();