aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
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/SceneObjectGroup.cs
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/SceneObjectGroup.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index e860862..dcbaeb7 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1067,7 +1067,7 @@ namespace OpenSim.Region.Framework.Scenes
1067 /// No avatar should appear more than once in this list. 1067 /// No avatar should appear more than once in this list.
1068 /// Do not manipulate this list directly - use the Add/Remove sitting avatar methods on SceneObjectPart. 1068 /// Do not manipulate this list directly - use the Add/Remove sitting avatar methods on SceneObjectPart.
1069 /// </remarks> 1069 /// </remarks>
1070 protected internal List<UUID> m_sittingAvatars = new List<UUID>(); 1070 protected internal List<ScenePresence> m_sittingAvatars = new List<ScenePresence>();
1071 1071
1072 #endregion 1072 #endregion
1073 1073
@@ -2348,7 +2348,7 @@ namespace OpenSim.Region.Framework.Scenes
2348 2348
2349 // new group as no sitting avatars 2349 // new group as no sitting avatars
2350 dupe.m_linkedAvatars = new List<ScenePresence>(); 2350 dupe.m_linkedAvatars = new List<ScenePresence>();
2351 dupe.m_sittingAvatars = new List<UUID>(); 2351 dupe.m_sittingAvatars = new List<ScenePresence>();
2352 2352
2353 dupe.CopyRootPart(m_rootPart, OwnerID, GroupID, userExposed); 2353 dupe.CopyRootPart(m_rootPart, OwnerID, GroupID, userExposed);
2354 dupe.m_rootPart.LinkNum = m_rootPart.LinkNum; 2354 dupe.m_rootPart.LinkNum = m_rootPart.LinkNum;
@@ -4821,10 +4821,10 @@ namespace OpenSim.Region.Framework.Scenes
4821 /// down after it move one place down the list. 4821 /// down after it move one place down the list.
4822 /// </remarks> 4822 /// </remarks>
4823 /// <returns>A list of the sitting avatars. Returns an empty list if there are no sitting avatars.</returns> 4823 /// <returns>A list of the sitting avatars. Returns an empty list if there are no sitting avatars.</returns>
4824 public List<UUID> GetSittingAvatars() 4824 public List<ScenePresence> GetSittingAvatars()
4825 { 4825 {
4826 lock (m_sittingAvatars) 4826 lock (m_sittingAvatars)
4827 return new List<UUID>(m_sittingAvatars); 4827 return new List<ScenePresence>(m_sittingAvatars);
4828 } 4828 }
4829 4829
4830 /// <summary> 4830 /// <summary>