aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2010-03-22 18:51:07 +0000
committerMelanie2010-03-22 18:51:07 +0000
commitd378c758e1069507a9db837ed24f1e7c8a03c79a (patch)
treed8db7821aa2655ad99cc0d3ac0aa6dcb4f1dafb1 /OpenSim
parentRemove the reading of estate_settings.xml and the associated processing of (diff)
parent* Updated libomv libraries to fix JSON (LLSD) decoding errors on null values ... (diff)
downloadopensim-SC_OLD-d378c758e1069507a9db837ed24f1e7c8a03c79a.zip
opensim-SC_OLD-d378c758e1069507a9db837ed24f1e7c8a03c79a.tar.gz
opensim-SC_OLD-d378c758e1069507a9db837ed24f1e7c8a03c79a.tar.bz2
opensim-SC_OLD-d378c758e1069507a9db837ed24f1e7c8a03c79a.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
index cc53d6c..29c9219 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
@@ -114,7 +114,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
114 { 114 {
115 string credential = identity["Credential"].AsString(); 115 string credential = identity["Credential"].AsString();
116 116
117 if (password == credential || Utils.MD5String(password) == credential) 117 if (password == credential || "$1$" + Utils.MD5String(password) == credential)
118 return Authorize(principalID); 118 return Authorize(principalID);
119 } 119 }
120 } 120 }