OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

let us see our online friends

avinationmerge
UbitUmarov 2015-09-28 20:57:33 +01:00
parent 028cbb7cbe
commit f97807b53f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -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";