From 1e365df49500b3b814b7f9ae67ab2af0acc984a3 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Tue, 13 Jan 2009 16:49:01 +0000
Subject: * minor: Stop friendship termination crashing the client thread if
 the friend to be terminated could not be found

---
 OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'OpenSim/Region/Environment/Modules/Avatar')

diff --git a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
index 4a03ecd..9efaf81 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
@@ -671,6 +671,10 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
                 {
                     // wasn't sent, so ex-friend wasn't around on this region-server. Fetch info and try to send
                     UserAgentData data = m_initialScene.CommsManager.UserService.GetAgentByUUID(exfriendID);
+                    
+                    if (null == data)
+                        break;
+                    
                     if (!data.AgentOnline)
                     {
                         m_log.DebugFormat("[FRIEND]: {0} is offline, so not sending TerminateFriend", exfriendID);
-- 
cgit v1.1