aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs
diff options
context:
space:
mode:
authorubit2012-08-16 16:27:01 +0200
committerubit2012-08-16 16:27:01 +0200
commit998bd48d98d47670b1e199c195652ccc74758590 (patch)
treea2cdb20d8786d27c57b9617d832ce27ab65bee0f /OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parentfix vs2010 build (diff)
downloadopensim-SC_OLD-998bd48d98d47670b1e199c195652ccc74758590.zip
opensim-SC_OLD-998bd48d98d47670b1e199c195652ccc74758590.tar.gz
opensim-SC_OLD-998bd48d98d47670b1e199c195652ccc74758590.tar.bz2
opensim-SC_OLD-998bd48d98d47670b1e199c195652ccc74758590.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs b/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs
index 7fbf36d..bbc8470 100644
--- a/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs
+++ b/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs
@@ -64,6 +64,7 @@ namespace OpenSim.Services.AuthenticationService
64 { 64 {
65 AuthenticationData data = m_Database.Get(principalID); 65 AuthenticationData data = m_Database.Get(principalID);
66 string result = String.Empty; 66 string result = String.Empty;
67 realID = UUID.Zero;
67 if (data != null && data.Data != null) 68 if (data != null && data.Data != null)
68 { 69 {
69 if (data.Data.ContainsKey("webLoginKey")) 70 if (data.Data.ContainsKey("webLoginKey"))
@@ -85,7 +86,7 @@ namespace OpenSim.Services.AuthenticationService
85 } 86 }
86 } 87 }
87 88
88 realID = UUID.Zero; 89
89 90
90 if (result == string.Empty) 91 if (result == string.Empty)
91 { 92 {
@@ -96,6 +97,8 @@ namespace OpenSim.Services.AuthenticationService
96 { 97 {
97 m_log.DebugFormat("[AUTH SERVICE]: PrincipalID {0} or its data not found", principalID); 98 m_log.DebugFormat("[AUTH SERVICE]: PrincipalID {0} or its data not found", principalID);
98 } 99 }
100
101
99 return result; 102 return result;
100 } 103 }
101 } 104 }