diff options
| author | Melanie Thielker | 2017-01-07 00:37:13 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2017-01-07 00:37:13 +0000 |
| commit | 1e9cbf5c97ef34d5c4feb985bb92ede8ab6fab4c (patch) | |
| tree | bb4d88cb161244173c047778ffb0d0887c7cfdca | |
| parent | Squelch red ink for login cancel by the user during circuit setup (diff) | |
| download | opensim-SC-1e9cbf5c97ef34d5c4feb985bb92ede8ab6fab4c.zip opensim-SC-1e9cbf5c97ef34d5c4feb985bb92ede8ab6fab4c.tar.gz opensim-SC-1e9cbf5c97ef34d5c4feb985bb92ede8ab6fab4c.tar.bz2 opensim-SC-1e9cbf5c97ef34d5c4feb985bb92ede8ab6fab4c.tar.xz | |
During login cancel, don't error out here on a null client.
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs index 7980de3..35b48d9 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |||
| @@ -369,6 +369,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
| 369 | 369 | ||
| 370 | public virtual bool SendFriendsOnlineIfNeeded(IClientAPI client) | 370 | public virtual bool SendFriendsOnlineIfNeeded(IClientAPI client) |
| 371 | { | 371 | { |
| 372 | if (client == null) | ||
| 373 | return false; | ||
| 374 | |||
| 372 | UUID agentID = client.AgentId; | 375 | UUID agentID = client.AgentId; |
| 373 | 376 | ||
| 374 | // Check if the online friends list is needed | 377 | // Check if the online friends list is needed |