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/Connectors | |
| 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 'OpenSim/Services/Connectors')
| -rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs | 1 |
1 files changed, 1 insertions, 0 deletions
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 | ||