diff options
author | Kevin Cozens | 2015-09-21 10:58:35 -0400 |
---|---|---|
committer | Kevin Cozens | 2015-09-21 11:00:34 -0400 |
commit | b412db72be9c7a3833550119ba4d1c04b995d188 (patch) | |
tree | 506ca226d36275d9e802249d1bf1f7cbeee6eee4 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
parent | coment out lludp debug things that only fill up the help screen (diff) | |
download | opensim-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/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index f63fa71..974dd62 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -2884,7 +2884,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2884 | { | 2884 | { |
2885 | 2885 | ||
2886 | m_requestedSitTargetID = 0; | 2886 | m_requestedSitTargetID = 0; |
2887 | part.RemoveSittingAvatar(UUID); | 2887 | part.RemoveSittingAvatar(this); |
2888 | part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK); | 2888 | part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK); |
2889 | 2889 | ||
2890 | SendAvatarDataToAllAgents(); | 2890 | SendAvatarDataToAllAgents(); |
@@ -2984,7 +2984,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2984 | 2984 | ||
2985 | Velocity = Vector3.Zero; | 2985 | Velocity = Vector3.Zero; |
2986 | 2986 | ||
2987 | part.AddSittingAvatar(UUID); | 2987 | part.AddSittingAvatar(this); |
2988 | 2988 | ||
2989 | cameraAtOffset = part.GetCameraAtOffset(); | 2989 | cameraAtOffset = part.GetCameraAtOffset(); |
2990 | cameraEyeOffset = part.GetCameraEyeOffset(); | 2990 | cameraEyeOffset = part.GetCameraEyeOffset(); |
@@ -3132,7 +3132,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3132 | Velocity = Vector3.Zero; | 3132 | Velocity = Vector3.Zero; |
3133 | m_AngularVelocity = Vector3.Zero; | 3133 | m_AngularVelocity = Vector3.Zero; |
3134 | 3134 | ||
3135 | part.AddSittingAvatar(UUID); | 3135 | part.AddSittingAvatar(this); |
3136 | 3136 | ||
3137 | Vector3 cameraAtOffset = part.GetCameraAtOffset(); | 3137 | Vector3 cameraAtOffset = part.GetCameraAtOffset(); |
3138 | Vector3 cameraEyeOffset = part.GetCameraEyeOffset(); | 3138 | Vector3 cameraEyeOffset = part.GetCameraEyeOffset(); |