From 4240f2dec6f7348a99aea0d1b040fca6ea9d493b Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 1 Jan 2010 16:54:24 -0800
Subject: New LL login service is working! -- tested in standalone only. Things
still missing from response, namely Library and Friends. Appearance service
is also missing.
---
.../CoreModules/Resources/CoreModulePlugin.addin.xml | 2 ++
OpenSim/Region/Framework/Scenes/Scene.cs | 14 +++++++++++---
2 files changed, 13 insertions(+), 3 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
index d654d13..5f5dc02 100644
--- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
+++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
@@ -32,6 +32,8 @@
+
+
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 7db99e1..418cfbf 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3483,10 +3483,18 @@ namespace OpenSim.Region.Framework.Scenes
{
reason = String.Empty;
- bool result = CommsManager.UserService.VerifySession(agent.AgentID, agent.SessionID);
- m_log.Debug("[CONNECTION BEGIN]: User authentication returned " + result);
+ IAuthenticationService auth = RequestModuleInterface();
+ if (auth == null)
+ {
+ reason = String.Format("Failed to authenticate user {0} {1} in region {2}. Authentication service does not exist.", agent.firstname, agent.lastname, RegionInfo.RegionName);
+ return false;
+ }
+
+ bool result = auth.Verify(agent.AgentID, agent.SecureSessionID.ToString(), 30);
+
+ m_log.Debug("[CONNECTION BEGIN]: Session authentication returned " + result);
if (!result)
- reason = String.Format("Failed to authenticate user {0} {1}, access denied.", agent.firstname, agent.lastname);
+ reason = String.Format("Failed to authenticate user {0} {1}, access denied to region {2}.", agent.firstname, agent.lastname, RegionInfo.RegionName);
return result;
}
--
cgit v1.1