diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 13 |
1 files changed, 2 insertions, 11 deletions
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 | |||
217 | 217 | ||
218 | scene.EventManager.OnNewClient += OnNewClient; | 218 | scene.EventManager.OnNewClient += OnNewClient; |
219 | scene.EventManager.OnClientClosed += OnClientClosed; | 219 | scene.EventManager.OnClientClosed += OnClientClosed; |
220 | // scene.EventManager.OnMakeRootAgent += OnMakeRootAgent; | 220 | scene.EventManager.OnMakeRootAgent += OnMakeRootAgent; |
221 | scene.EventManager.OnClientLogin += OnClientLogin; | 221 | scene.EventManager.OnClientLogin += OnClientLogin; |
222 | } | 222 | } |
223 | 223 | ||
@@ -364,16 +364,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
364 | 364 | ||
365 | public void IsNowRoot(ScenePresence sp) | 365 | public void IsNowRoot(ScenePresence sp) |
366 | { | 366 | { |
367 | RecacheFriends(sp.ControllingClient); | 367 | OnMakeRootAgent(sp); |
368 | |||
369 | lock (m_NeedsToNotifyStatus) | ||
370 | { | ||
371 | if (m_NeedsToNotifyStatus.Remove(sp.UUID)) | ||
372 | { | ||
373 | // Inform the friends that this user is online. This can only be done once the client is a Root Agent. | ||
374 | StatusChange(sp.UUID, true); | ||
375 | } | ||
376 | } | ||
377 | } | 368 | } |
378 | 369 | ||
379 | public virtual bool SendFriendsOnlineIfNeeded(IClientAPI client) | 370 | public virtual bool SendFriendsOnlineIfNeeded(IClientAPI client) |