From c41d2a1e3d460d4aa6c387fc553f2563d699511d Mon Sep 17 00:00:00 2001
From: diva
Date: Sat, 18 Apr 2009 02:55:45 +0000
Subject: Bug fix for standalone HG login. VerifySession should be local for
 local users.

---
 OpenSim/Region/Communications/Hypergrid/HGUserServices.cs | 10 ++++++++++
 OpenSim/Region/Communications/OGS1/OGS1UserServices.cs    |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Communications')

diff --git a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
index 20c7dc1..370ef12 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
@@ -316,6 +316,16 @@ namespace OpenSim.Region.Communications.Hypergrid
         }
         #endregion
 
+        public override bool VerifySession(UUID userID, UUID sessionID)
+        {
+            string url = string.Empty;
+            if ((m_localUserServices != null) && (!IsForeignUser(userID, out url)))
+                return m_localUserServices.VerifySession(userID, sessionID);
+            else
+                return base.VerifySession(userID, sessionID);
+        }
+
+
         protected override string GetUserServerURL(UUID userID)
         {
             string serverURL = string.Empty;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index e5ea929..1836328 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -847,7 +847,7 @@ namespace OpenSim.Region.Communications.OGS1
             }
         }
 
-        public bool VerifySession(UUID userID, UUID sessionID)
+        public virtual bool VerifySession(UUID userID, UUID sessionID)
         {
             m_log.DebugFormat("[OGS1 USER SERVICES]: Verifying user session for " + userID);
             return AuthClient.VerifySession(GetUserServerURL(userID), userID, sessionID);
-- 
cgit v1.1