diff options
author | diva | 2009-04-18 02:55:45 +0000 |
---|---|---|
committer | diva | 2009-04-18 02:55:45 +0000 |
commit | c41d2a1e3d460d4aa6c387fc553f2563d699511d (patch) | |
tree | 4f08c18d9f1454f2d618fbd419cafc24031f43a0 | |
parent | Commit agent to DB immediately after creation, for LLSD logins too. Addresses... (diff) | |
download | opensim-SC_OLD-c41d2a1e3d460d4aa6c387fc553f2563d699511d.zip opensim-SC_OLD-c41d2a1e3d460d4aa6c387fc553f2563d699511d.tar.gz opensim-SC_OLD-c41d2a1e3d460d4aa6c387fc553f2563d699511d.tar.bz2 opensim-SC_OLD-c41d2a1e3d460d4aa6c387fc553f2563d699511d.tar.xz |
Bug fix for standalone HG login. VerifySession should be local for local users.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Communications/Hypergrid/HGUserServices.cs | 10 | ||||
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1UserServices.cs | 2 |
2 files changed, 11 insertions, 1 deletions
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 | |||
316 | } | 316 | } |
317 | #endregion | 317 | #endregion |
318 | 318 | ||
319 | public override bool VerifySession(UUID userID, UUID sessionID) | ||
320 | { | ||
321 | string url = string.Empty; | ||
322 | if ((m_localUserServices != null) && (!IsForeignUser(userID, out url))) | ||
323 | return m_localUserServices.VerifySession(userID, sessionID); | ||
324 | else | ||
325 | return base.VerifySession(userID, sessionID); | ||
326 | } | ||
327 | |||
328 | |||
319 | protected override string GetUserServerURL(UUID userID) | 329 | protected override string GetUserServerURL(UUID userID) |
320 | { | 330 | { |
321 | string serverURL = string.Empty; | 331 | 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 | |||
847 | } | 847 | } |
848 | } | 848 | } |
849 | 849 | ||
850 | public bool VerifySession(UUID userID, UUID sessionID) | 850 | public virtual bool VerifySession(UUID userID, UUID sessionID) |
851 | { | 851 | { |
852 | m_log.DebugFormat("[OGS1 USER SERVICES]: Verifying user session for " + userID); | 852 | m_log.DebugFormat("[OGS1 USER SERVICES]: Verifying user session for " + userID); |
853 | return AuthClient.VerifySession(GetUserServerURL(userID), userID, sessionID); | 853 | return AuthClient.VerifySession(GetUserServerURL(userID), userID, sessionID); |