From f97807b53fb0bdf2fcf9d67643de99853af41e2f Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Mon, 28 Sep 2015 20:57:33 +0100
Subject:  let us see our online friends

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes')

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
                 if (!IsChildAgent && openChildAgents)
                 {
                     IFriendsModule friendsModule = m_scene.RequestModuleInterface<IFriendsModule>();
-//                    if (friendsModule != null)
-//                        friendsModule.SendFriendsOnlineIfNeeded(ControllingClient);
+                    if (friendsModule != null)
+                        friendsModule.SendFriendsOnlineIfNeeded(ControllingClient);
 
                     m_log.DebugFormat("[CompleteMovement] friendsModule: {0}ms", Util.EnvironmentTickCountSubtract(ts));
 
@@ -2882,7 +2882,6 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (satOnObject)
             {
-
                 m_requestedSitTargetID = 0;
                 part.RemoveSittingAvatar(this);
                 part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
@@ -3011,7 +3010,6 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                 }
 
-
                 ControllingClient.SendSitResponse(
                     part.ParentGroup.UUID, offset, sitOrientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook);
 
@@ -3181,7 +3179,7 @@ namespace OpenSim.Region.Framework.Scenes
             if (IsChildAgent)
                 return;
 
-            SceneObjectPart part = m_scene.GetSceneObjectPart(m_requestedSitTargetID);
+             SceneObjectPart part = m_scene.GetSceneObjectPart(m_requestedSitTargetID);
 
             if (part != null)
             {
@@ -3262,12 +3260,14 @@ namespace OpenSim.Region.Framework.Scenes
                 }
 
                 part.AddSittingAvatar(this);
-                ParentPart = m_scene.GetSceneObjectPart(m_requestedSitTargetID);
+                ParentPart = part;
                 ParentID = m_requestedSitTargetID;
                 m_AngularVelocity = Vector3.Zero;
                 Velocity = Vector3.Zero;
                 RemoveFromPhysicalScene();
 
+                m_requestedSitTargetID = 0;
+
                 SendAvatarDataToAllAgents();
 
                 sitAnimation = "SIT";
-- 
cgit v1.1