From 1e9cbf5c97ef34d5c4feb985bb92ede8ab6fab4c Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Sat, 7 Jan 2017 00:37:13 +0000
Subject: During login cancel, don't error out here on a null client.

---
 OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 3 +++
 1 file changed, 3 insertions(+)

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
 
         public virtual bool SendFriendsOnlineIfNeeded(IClientAPI client)
         {
+            if (client == null)
+                return false;
+
             UUID agentID = client.AgentId;
 
             // Check if the online friends list is needed
-- 
cgit v1.1