diff options
author | UbitUmarov | 2012-08-16 15:26:16 +0100 |
---|---|---|
committer | UbitUmarov | 2012-08-16 15:26:16 +0100 |
commit | db3f0a37485bfecc831104d9dbcd397404364e79 (patch) | |
tree | bb1c5a03f42132cebfc386409f395605a5086aca /OpenSim/Services | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC-db3f0a37485bfecc831104d9dbcd397404364e79.zip opensim-SC-db3f0a37485bfecc831104d9dbcd397404364e79.tar.gz opensim-SC-db3f0a37485bfecc831104d9dbcd397404364e79.tar.bz2 opensim-SC-db3f0a37485bfecc831104d9dbcd397404364e79.tar.xz |
fix vs2010 build
Diffstat (limited to '')
4 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs index 9d12d47..a069838 100644 --- a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs +++ b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs | |||
@@ -65,7 +65,6 @@ namespace OpenSim.Services.AuthenticationService | |||
65 | public string Authenticate(UUID principalID, string password, int lifetime) | 65 | public string Authenticate(UUID principalID, string password, int lifetime) |
66 | { | 66 | { |
67 | UUID realID; | 67 | UUID realID; |
68 | |||
69 | return Authenticate(principalID, password, lifetime, out realID); | 68 | return Authenticate(principalID, password, lifetime, out realID); |
70 | } | 69 | } |
71 | 70 | ||
diff --git a/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs b/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs index 47b4fa6..1510168 100644 --- a/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs +++ b/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs | |||
@@ -63,7 +63,6 @@ namespace OpenSim.Services.AuthenticationService | |||
63 | public string Authenticate(UUID principalID, string password, int lifetime, out UUID realID) | 63 | public string Authenticate(UUID principalID, string password, int lifetime, out UUID realID) |
64 | { | 64 | { |
65 | realID = UUID.Zero; | 65 | realID = UUID.Zero; |
66 | |||
67 | return Authenticate(principalID, password, lifetime); | 66 | return Authenticate(principalID, password, lifetime); |
68 | } | 67 | } |
69 | 68 | ||
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 | } |
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs index 331d485..ffae0da 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs | |||
@@ -104,6 +104,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
104 | 104 | ||
105 | public string Authenticate(UUID principalID, string password, int lifetime, out UUID realID) | 105 | public string Authenticate(UUID principalID, string password, int lifetime, out UUID realID) |
106 | { | 106 | { |
107 | realID = UUID.Zero; | ||
107 | return Authenticate(principalID, password, lifetime); | 108 | return Authenticate(principalID, password, lifetime); |
108 | } | 109 | } |
109 | 110 | ||