diff options
author | UbitUmarov | 2015-09-28 20:57:33 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-28 20:57:33 +0100 |
commit | f97807b53fb0bdf2fcf9d67643de99853af41e2f (patch) | |
tree | 72e8f2470c5ab84b859d9e53b7f4ef6d5995f59c /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
parent | remove a auxiliar vector no longer needed (diff) | |
download | opensim-SC_OLD-f97807b53fb0bdf2fcf9d67643de99853af41e2f.zip opensim-SC_OLD-f97807b53fb0bdf2fcf9d67643de99853af41e2f.tar.gz opensim-SC_OLD-f97807b53fb0bdf2fcf9d67643de99853af41e2f.tar.bz2 opensim-SC_OLD-f97807b53fb0bdf2fcf9d67643de99853af41e2f.tar.xz |
let us see our online friends
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index ea20c36..4e2ea28 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -2025,8 +2025,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
2025 | if (!IsChildAgent && openChildAgents) | 2025 | if (!IsChildAgent && openChildAgents) |
2026 | { | 2026 | { |
2027 | IFriendsModule friendsModule = m_scene.RequestModuleInterface<IFriendsModule>(); | 2027 | IFriendsModule friendsModule = m_scene.RequestModuleInterface<IFriendsModule>(); |
2028 | // if (friendsModule != null) | 2028 | if (friendsModule != null) |
2029 | // friendsModule.SendFriendsOnlineIfNeeded(ControllingClient); | 2029 | friendsModule.SendFriendsOnlineIfNeeded(ControllingClient); |
2030 | 2030 | ||
2031 | m_log.DebugFormat("[CompleteMovement] friendsModule: {0}ms", Util.EnvironmentTickCountSubtract(ts)); | 2031 | m_log.DebugFormat("[CompleteMovement] friendsModule: {0}ms", Util.EnvironmentTickCountSubtract(ts)); |
2032 | 2032 | ||
@@ -2882,7 +2882,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
2882 | 2882 | ||
2883 | if (satOnObject) | 2883 | if (satOnObject) |
2884 | { | 2884 | { |
2885 | |||
2886 | m_requestedSitTargetID = 0; | 2885 | m_requestedSitTargetID = 0; |
2887 | part.RemoveSittingAvatar(this); | 2886 | part.RemoveSittingAvatar(this); |
2888 | part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK); | 2887 | part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK); |
@@ -3011,7 +3010,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
3011 | } | 3010 | } |
3012 | } | 3011 | } |
3013 | 3012 | ||
3014 | |||
3015 | ControllingClient.SendSitResponse( | 3013 | ControllingClient.SendSitResponse( |
3016 | part.ParentGroup.UUID, offset, sitOrientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook); | 3014 | part.ParentGroup.UUID, offset, sitOrientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook); |
3017 | 3015 | ||
@@ -3181,7 +3179,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3181 | if (IsChildAgent) | 3179 | if (IsChildAgent) |
3182 | return; | 3180 | return; |
3183 | 3181 | ||
3184 | SceneObjectPart part = m_scene.GetSceneObjectPart(m_requestedSitTargetID); | 3182 | SceneObjectPart part = m_scene.GetSceneObjectPart(m_requestedSitTargetID); |
3185 | 3183 | ||
3186 | if (part != null) | 3184 | if (part != null) |
3187 | { | 3185 | { |
@@ -3262,12 +3260,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
3262 | } | 3260 | } |
3263 | 3261 | ||
3264 | part.AddSittingAvatar(this); | 3262 | part.AddSittingAvatar(this); |
3265 | ParentPart = m_scene.GetSceneObjectPart(m_requestedSitTargetID); | 3263 | ParentPart = part; |
3266 | ParentID = m_requestedSitTargetID; | 3264 | ParentID = m_requestedSitTargetID; |
3267 | m_AngularVelocity = Vector3.Zero; | 3265 | m_AngularVelocity = Vector3.Zero; |
3268 | Velocity = Vector3.Zero; | 3266 | Velocity = Vector3.Zero; |
3269 | RemoveFromPhysicalScene(); | 3267 | RemoveFromPhysicalScene(); |
3270 | 3268 | ||
3269 | m_requestedSitTargetID = 0; | ||
3270 | |||
3271 | SendAvatarDataToAllAgents(); | 3271 | SendAvatarDataToAllAgents(); |
3272 | 3272 | ||
3273 | sitAnimation = "SIT"; | 3273 | sitAnimation = "SIT"; |