diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index b58e7c4..cb12d65 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -4416,10 +4416,27 @@ namespace OpenSim.Region.Framework.Scenes | |||
4416 | 4416 | ||
4417 | // Check that the auth_token is valid | 4417 | // Check that the auth_token is valid |
4418 | AgentCircuitData acd = AuthenticateHandler.GetAgentCircuitData(agentID); | 4418 | AgentCircuitData acd = AuthenticateHandler.GetAgentCircuitData(agentID); |
4419 | if (acd != null && acd.SessionID.ToString() == auth_token) | 4419 | |
4420 | if (acd == null) | ||
4421 | { | ||
4422 | m_log.DebugFormat( | ||
4423 | "[SCENE]: Request to close agent {0} but no such agent in scene {1}. May have been closed previously.", | ||
4424 | agentID, Name); | ||
4425 | |||
4426 | return false; | ||
4427 | } | ||
4428 | |||
4429 | if (acd.SessionID.ToString() == auth_token) | ||
4430 | { | ||
4420 | return IncomingCloseAgent(agentID, force); | 4431 | return IncomingCloseAgent(agentID, force); |
4432 | } | ||
4421 | else | 4433 | else |
4422 | m_log.ErrorFormat("[SCENE]: Request to close agent {0} with invalid authorization token {1}", agentID, auth_token); | 4434 | { |
4435 | m_log.WarnFormat( | ||
4436 | "[SCENE]: Request to close agent {0} with invalid authorization token {1} in {2}", | ||
4437 | agentID, auth_token, Name); | ||
4438 | } | ||
4439 | |||
4423 | return false; | 4440 | return false; |
4424 | } | 4441 | } |
4425 | 4442 | ||