From 5861355577f235e91f5dd5b9539a9487b5699bdf Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Thu, 4 Aug 2016 17:39:10 +0100 Subject: do friends recaching on MakeRoot for normal tps, delay it on crossings --- OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'OpenSim/Region') diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs index c1c5613..aaa331b 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs @@ -217,7 +217,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends scene.EventManager.OnNewClient += OnNewClient; scene.EventManager.OnClientClosed += OnClientClosed; -// scene.EventManager.OnMakeRootAgent += OnMakeRootAgent; + scene.EventManager.OnMakeRootAgent += OnMakeRootAgent; scene.EventManager.OnClientLogin += OnClientLogin; } @@ -364,16 +364,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends public void IsNowRoot(ScenePresence sp) { - RecacheFriends(sp.ControllingClient); - - lock (m_NeedsToNotifyStatus) - { - if (m_NeedsToNotifyStatus.Remove(sp.UUID)) - { - // Inform the friends that this user is online. This can only be done once the client is a Root Agent. - StatusChange(sp.UUID, true); - } - } + OnMakeRootAgent(sp); } public virtual bool SendFriendsOnlineIfNeeded(IClientAPI client) -- cgit v1.1