aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2013-07-13 22:52:51 -0700
committerDiva Canto2013-07-13 22:52:51 -0700
commite4f741f0062dfe948e071a88f643f96931140f67 (patch)
tree663d45415d6365c564da28a6c168e9be6d7578ca
parentDeleted a line too many (diff)
downloadopensim-SC_OLD-e4f741f0062dfe948e071a88f643f96931140f67.zip
opensim-SC_OLD-e4f741f0062dfe948e071a88f643f96931140f67.tar.gz
opensim-SC_OLD-e4f741f0062dfe948e071a88f643f96931140f67.tar.bz2
opensim-SC_OLD-e4f741f0062dfe948e071a88f643f96931140f67.tar.xz
This should fix the failing test.
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 264aaa8..155054a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3452,7 +3452,7 @@ namespace OpenSim.Region.Framework.Scenes
3452 regions.Remove(RegionInfo.RegionHandle); 3452 regions.Remove(RegionInfo.RegionHandle);
3453 3453
3454 // This ends up being done asynchronously so that a logout isn't held up where there are many present but unresponsive neighbours. 3454 // This ends up being done asynchronously so that a logout isn't held up where there are many present but unresponsive neighbours.
3455 m_sceneGridService.SendCloseChildAgentConnections(agentID, Util.Md5Hash(acd.Id0), regions); 3455 m_sceneGridService.SendCloseChildAgentConnections(agentID, acd.Id0 != null ? Util.Md5Hash(acd.Id0) : string.Empty, regions);
3456 } 3456 }
3457 3457
3458 m_eventManager.TriggerClientClosed(agentID, this); 3458 m_eventManager.TriggerClientClosed(agentID, this);
@@ -4308,7 +4308,6 @@ namespace OpenSim.Region.Framework.Scenes
4308 public bool IncomingCloseAgent(UUID agentID, bool force) 4308 public bool IncomingCloseAgent(UUID agentID, bool force)
4309 { 4309 {
4310 //m_log.DebugFormat("[SCENE]: Processing incoming close agent for {0}", agentID); 4310 //m_log.DebugFormat("[SCENE]: Processing incoming close agent for {0}", agentID);
4311
4312 ScenePresence presence = m_sceneGraph.GetScenePresence(agentID); 4311 ScenePresence presence = m_sceneGraph.GetScenePresence(agentID);
4313 if (presence != null) 4312 if (presence != null)
4314 { 4313 {