aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.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/Scene.cs
parentcoment out lludp debug things that only fill up the help screen (diff)
downloadopensim-SC-b412db72be9c7a3833550119ba4d1c04b995d188.zip
opensim-SC-b412db72be9c7a3833550119ba4d1c04b995d188.tar.gz
opensim-SC-b412db72be9c7a3833550119ba4d1c04b995d188.tar.bz2
opensim-SC-b412db72be9c7a3833550119ba4d1c04b995d188.tar.xz
Fix a regression to GetSittingAvatars(). Return List<ScenePresence> once more.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rwxr-xr-xOpenSim/Region/Framework/Scenes/Scene.cs8
1 files changed, 3 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index db64eb7..74cc161 100755
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2631,12 +2631,10 @@ namespace OpenSim.Region.Framework.Scenes
2631 else 2631 else
2632 group.StopScriptInstances(); 2632 group.StopScriptInstances();
2633 2633
2634 List<UUID> avatars = group.GetSittingAvatars(); 2634 List<ScenePresence> avatars = group.GetSittingAvatars();
2635 foreach (UUID av in avatars) 2635 foreach (ScenePresence av in avatars)
2636 { 2636 {
2637 ScenePresence p = GetScenePresence(av); 2637 av.StandUp();
2638 if (p != null && p.ParentUUID == UUID.Zero)
2639 p.StandUp();
2640 } 2638 }
2641 2639
2642 SceneObjectPart[] partList = group.Parts; 2640 SceneObjectPart[] partList = group.Parts;