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/Region/CoreModules | |
| 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/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs index 25ee4c6..d809ac2 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs | |||
| @@ -140,6 +140,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authentication | |||
| 140 | public string Authenticate(UUID principalID, string password, int lifetime, out UUID realID) | 140 | public string Authenticate(UUID principalID, string password, int lifetime, out UUID realID) |
| 141 | { | 141 | { |
| 142 | // Not implemented at the regions | 142 | // Not implemented at the regions |
| 143 | realID = UUID.Zero; | ||
| 143 | return string.Empty; | 144 | return string.Empty; |
| 144 | } | 145 | } |
| 145 | 146 | ||