aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorDiva Canto2013-07-14 07:28:40 -0700
committerDiva Canto2013-07-14 07:28:40 -0700
commitf3b3e21dea98b4ea974ae7649a63d00b69e6dfed (patch)
treee617ad347d3613ddbb2a3e138de1dd96c1cecfd7 /OpenSim/Region/Framework/Scenes/Scene.cs
parentAnd this fixes the other failing tests. Justin, the thread pool is not being ... (diff)
downloadopensim-SC_OLD-f3b3e21dea98b4ea974ae7649a63d00b69e6dfed.zip
opensim-SC_OLD-f3b3e21dea98b4ea974ae7649a63d00b69e6dfed.tar.gz
opensim-SC_OLD-f3b3e21dea98b4ea974ae7649a63d00b69e6dfed.tar.bz2
opensim-SC_OLD-f3b3e21dea98b4ea974ae7649a63d00b69e6dfed.tar.xz
Change the auth token to be the user's sessionid.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 155054a..ea7081c 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, acd.Id0 != null ? Util.Md5Hash(acd.Id0) : string.Empty, regions); 3455 m_sceneGridService.SendCloseChildAgentConnections(agentID, acd.SessionID.ToString(), regions);
3456 } 3456 }
3457 3457
3458 m_eventManager.TriggerClientClosed(agentID, this); 3458 m_eventManager.TriggerClientClosed(agentID, this);
@@ -4290,7 +4290,7 @@ namespace OpenSim.Region.Framework.Scenes
4290 4290
4291 // Check that the auth_token is valid 4291 // Check that the auth_token is valid
4292 AgentCircuitData acd = AuthenticateHandler.GetAgentCircuitData(agentID); 4292 AgentCircuitData acd = AuthenticateHandler.GetAgentCircuitData(agentID);
4293 if (acd != null && Util.Md5Hash(acd.Id0) == auth_token) 4293 if (acd != null && acd.SessionID.ToString() == auth_token)
4294 return IncomingCloseAgent(agentID, force); 4294 return IncomingCloseAgent(agentID, force);
4295 else 4295 else
4296 m_log.ErrorFormat("[SCENE]: Request to close agent {0} with invalid authorization token {1}", agentID, auth_token); 4296 m_log.ErrorFormat("[SCENE]: Request to close agent {0} with invalid authorization token {1}", agentID, auth_token);