diff options
| author | Melanie | 2011-10-25 03:26:09 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-25 03:26:09 +0100 |
| commit | 4e9457ca0c8669a0d47341c651d5f439fda1eb8d (patch) | |
| tree | 002620738b62275e4dca20a56b701b5ac8b7642d /OpenSim/Region | |
| parent | Merge commit 'b868328d519cfb3db597f684fd1f947912fc2222' into bigmerge (diff) | |
| parent | Add optional getauthinfo and setauthinfo authentication service calls. (diff) | |
| download | opensim-SC_OLD-4e9457ca0c8669a0d47341c651d5f439fda1eb8d.zip opensim-SC_OLD-4e9457ca0c8669a0d47341c651d5f439fda1eb8d.tar.gz opensim-SC_OLD-4e9457ca0c8669a0d47341c651d5f439fda1eb8d.tar.bz2 opensim-SC_OLD-4e9457ca0c8669a0d47341c651d5f439fda1eb8d.tar.xz | |
Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmerge
Conflicts:
OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs index acc362b..9484a5a 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs | |||
| @@ -158,7 +158,16 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authentication | |||
| 158 | return m_AuthenticationService.SetPassword(principalID, passwd); | 158 | return m_AuthenticationService.SetPassword(principalID, passwd); |
| 159 | } | 159 | } |
| 160 | 160 | ||
| 161 | #endregion | 161 | public AuthInfo GetAuthInfo(UUID principalID) |
| 162 | { | ||
| 163 | return m_AuthenticationService.GetAuthInfo(principalID); | ||
| 164 | } | ||
| 162 | 165 | ||
| 166 | public bool SetAuthInfo(AuthInfo info) | ||
| 167 | { | ||
| 168 | return m_AuthenticationService.SetAuthInfo(info); | ||
| 169 | } | ||
| 170 | |||
| 171 | #endregion | ||
| 163 | } | 172 | } |
| 164 | } | 173 | } |