diff options
| author | Melanie | 2012-08-24 23:53:14 +0200 |
|---|---|---|
| committer | Melanie | 2012-08-24 23:53:14 +0200 |
| commit | f1a71f544b02893c064b98368bd640fa2492a170 (patch) | |
| tree | 2100bd63e85a37948dfc74a07f1d70a82a665048 /OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs | |
| parent | Remove debug spam (diff) | |
| parent | let setLinkPrimParams terminate even if there are no more parts. (diff) | |
| download | opensim-SC-f1a71f544b02893c064b98368bd640fa2492a170.zip opensim-SC-f1a71f544b02893c064b98368bd640fa2492a170.tar.gz opensim-SC-f1a71f544b02893c064b98368bd640fa2492a170.tar.bz2 opensim-SC-f1a71f544b02893c064b98368bd640fa2492a170.tar.xz | |
Merge branch 'ubitwork' into avination
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs | 1 |
1 files changed, 0 insertions, 1 deletions
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 | ||