OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* minor: Stop friendship termination crashing the client thread if the friend to be terminated could not be found

0.6.2-post-fixes
Justin Clarke Casey 2009-01-13 16:49:01 +00:00
parent 87eff82b28
commit 1e365df495
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
View File

@ -307,8 +307,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
catch (System.ObjectDisposedException) catch (System.ObjectDisposedException)
{ {
m_log.Info("[UDPSERVER]: UDP Object disposed. No need to worry about this if you're restarting the simulator."); m_log.Info("[UDPSERVER]: UDP Object disposed. No need to worry about this if you're restarting the simulator.");
} }
} }
/// <summary> /// <summary>

4
OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
View File

@ -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 // 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); UserAgentData data = m_initialScene.CommsManager.UserService.GetAgentByUUID(exfriendID);
if (null == data)
break;
if (!data.AgentOnline) if (!data.AgentOnline)
{ {
m_log.DebugFormat("[FRIEND]: {0} is offline, so not sending TerminateFriend", exfriendID); m_log.DebugFormat("[FRIEND]: {0} is offline, so not sending TerminateFriend", exfriendID);