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/PasswordAuthenticationService.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/PasswordAuthenticationService.cs | 1 |
1 files changed, 0 insertions, 1 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 | ||