diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index dcbaeb7b6b..6029221f28 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs @@ -127,7 +127,6 @@ namespace OpenSim.Region.Framework.Scenes private long m_maxPersistTime = 0; private long m_minPersistTime = 0; // private Random m_rand; - private List m_linkedAvatars = new List(); /// /// This indicates whether the object has changed such that it needs to be repersisted to permenant storage @@ -600,7 +599,7 @@ namespace OpenSim.Region.Framework.Scenes part.GroupPosition = val; } - foreach (ScenePresence av in m_linkedAvatars) + foreach (ScenePresence av in m_sittingAvatars) { av.sitSOGmoved(); } @@ -670,7 +669,7 @@ namespace OpenSim.Region.Framework.Scenes if (destination == null) return sog; - if (sog.m_linkedAvatars.Count == 0) + if (sog.m_sittingAvatars.Count == 0) { entityTransfer.CrossPrimGroupIntoNewRegion(destination, newpos, sog, true, true); return sog; @@ -679,7 +678,7 @@ namespace OpenSim.Region.Framework.Scenes string reason = String.Empty; string version = String.Empty; - foreach (ScenePresence av in sog.m_linkedAvatars) + foreach (ScenePresence av in sog.m_sittingAvatars) { // We need to cross these agents. First, let's find // out if any of them can't cross for some reason. @@ -701,7 +700,7 @@ namespace OpenSim.Region.Framework.Scenes List avsToCross = new List(); - foreach (ScenePresence av in sog.m_linkedAvatars) + foreach (ScenePresence av in sog.m_sittingAvatars) { avtocrossInfo avinfo = new avtocrossInfo(); SceneObjectPart parentPart = sogScene.GetSceneObjectPart(av.ParentID); @@ -796,7 +795,7 @@ namespace OpenSim.Region.Framework.Scenes part.GroupPosition = oldp; } - foreach (ScenePresence av in sog.m_linkedAvatars) + foreach (ScenePresence av in sog.m_sittingAvatars) { av.sitSOGmoved(); } @@ -1697,47 +1696,6 @@ namespace OpenSim.Region.Framework.Scenes } } - /// - /// Add the avatar to this linkset (avatar is sat). - /// - /// - public void AddAvatar(UUID agentID) - { - ScenePresence presence; - if (m_scene.TryGetScenePresence(agentID, out presence)) - { - if (!m_linkedAvatars.Contains(presence)) - { - m_linkedAvatars.Add(presence); - } - } - } - - /// - /// Delete the avatar from this linkset (avatar is unsat). - /// - /// - public void DeleteAvatar(UUID agentID) - { - ScenePresence presence; - if (m_scene.TryGetScenePresence(agentID, out presence)) - { - if (m_linkedAvatars.Contains(presence)) - { - m_linkedAvatars.Remove(presence); - } - } - } - - /// - /// Returns the list of linked presences (avatars sat on this group) - /// - /// - public List GetLinkedAvatars() - { - return m_linkedAvatars; - } - /// /// Attach this scene object to the given avatar. /// @@ -2347,7 +2305,6 @@ namespace OpenSim.Region.Framework.Scenes dupe.inTransit = inTransit; // this shouldn't be needed TEST // new group as no sitting avatars - dupe.m_linkedAvatars = new List(); dupe.m_sittingAvatars = new List(); dupe.CopyRootPart(m_rootPart, OwnerID, GroupID, userExposed); diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index abac3c0bb1..43d522aa12 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs @@ -878,7 +878,7 @@ namespace OpenSim.Region.Framework.Scenes if (!m_parentGroup.m_dupeInProgress) { - List avs = ParentGroup.GetLinkedAvatars(); + List avs = ParentGroup.GetSittingAvatars(); foreach (ScenePresence av in avs) { if (av.ParentID == m_localId)