diff options
| author | UbitUmarov | 2017-01-07 16:55:03 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-07 16:55:03 +0000 |
| commit | add27a503e2558b7ddeb951d3e42e09b1c04fb36 (patch) | |
| tree | 888ab5919cb52f1e0201fc4ab60987a0df022f1f /OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | update permissions module with the new options (diff) | |
| download | opensim-SC-add27a503e2558b7ddeb951d3e42e09b1c04fb36.zip opensim-SC-add27a503e2558b7ddeb951d3e42e09b1c04fb36.tar.gz opensim-SC-add27a503e2558b7ddeb951d3e42e09b1c04fb36.tar.bz2 opensim-SC-add27a503e2558b7ddeb951d3e42e09b1c04fb36.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs')
| -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 |