aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/ServiceConnectorsOut
diff options
context:
space:
mode:
authorMelanie2012-08-31 00:34:22 +0100
committerMelanie2012-08-31 00:34:22 +0100
commitfd92560649cc9dd34b7b9a8dfabccf7582661a64 (patch)
tree97cc0a6aef597f014bafe62022c2619570f134fa /OpenSim/Region/CoreModules/ServiceConnectorsOut
parentMerge branch 'master' into careminster (diff)
parentMerge branch 'ubitwork' into avination (diff)
downloadopensim-SC_OLD-fd92560649cc9dd34b7b9a8dfabccf7582661a64.zip
opensim-SC_OLD-fd92560649cc9dd34b7b9a8dfabccf7582661a64.tar.gz
opensim-SC_OLD-fd92560649cc9dd34b7b9a8dfabccf7582661a64.tar.bz2
opensim-SC_OLD-fd92560649cc9dd34b7b9a8dfabccf7582661a64.tar.xz
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs1
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