aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-01-13 16:49:01 +0000
committerJustin Clarke Casey2009-01-13 16:49:01 +0000
commit1e365df49500b3b814b7f9ae67ab2af0acc984a3 (patch)
tree4d5051a4a5a623bd6a434770b6f5948830a4bfe1 /OpenSim
parent* Added resolving explicit .exe project names. This fixes mantis #2967 (diff)
downloadopensim-SC_OLD-1e365df49500b3b814b7f9ae67ab2af0acc984a3.zip
opensim-SC_OLD-1e365df49500b3b814b7f9ae67ab2af0acc984a3.tar.gz
opensim-SC_OLD-1e365df49500b3b814b7f9ae67ab2af0acc984a3.tar.bz2
opensim-SC_OLD-1e365df49500b3b814b7f9ae67ab2af0acc984a3.tar.xz
* minor: Stop friendship termination crashing the client thread if the friend to be terminated could not be found
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs3
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs4
2 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index f1a3c7f..a90c380 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -307,8 +307,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
307 catch (System.ObjectDisposedException) 307 catch (System.ObjectDisposedException)
308 { 308 {
309 m_log.Info("[UDPSERVER]: UDP Object disposed. No need to worry about this if you're restarting the simulator."); 309 m_log.Info("[UDPSERVER]: UDP Object disposed. No need to worry about this if you're restarting the simulator.");
310 } 310 }
311
312 } 311 }
313 312
314 /// <summary> 313 /// <summary>
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
671 { 671 {
672 // wasn't sent, so ex-friend wasn't around on this region-server. Fetch info and try to send 672 // wasn't sent, so ex-friend wasn't around on this region-server. Fetch info and try to send
673 UserAgentData data = m_initialScene.CommsManager.UserService.GetAgentByUUID(exfriendID); 673 UserAgentData data = m_initialScene.CommsManager.UserService.GetAgentByUUID(exfriendID);
674
675 if (null == data)
676 break;
677
674 if (!data.AgentOnline) 678 if (!data.AgentOnline)
675 { 679 {
676 m_log.DebugFormat("[FRIEND]: {0} is offline, so not sending TerminateFriend", exfriendID); 680 m_log.DebugFormat("[FRIEND]: {0} is offline, so not sending TerminateFriend", exfriendID);