aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJohn Hurliman2010-06-01 13:32:14 -0700
committerJohn Hurliman2010-06-01 13:32:14 -0700
commitd740035ef4414cc3543251d43c74ebb68fe08baf (patch)
tree0b24977c13c4b895c2175d01c3317fb096bfc92a
parentOne should not lock null objects. (diff)
downloadopensim-SC-d740035ef4414cc3543251d43c74ebb68fe08baf.zip
opensim-SC-d740035ef4414cc3543251d43c74ebb68fe08baf.tar.gz
opensim-SC-d740035ef4414cc3543251d43c74ebb68fe08baf.tar.bz2
opensim-SC-d740035ef4414cc3543251d43c74ebb68fe08baf.tar.xz
Applying patch from coyled to fix IAR support with the SimianGrid connectors
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 b19135e..de3ee4e 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
@@ -116,7 +116,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
116 { 116 {
117 string credential = identity["Credential"].AsString(); 117 string credential = identity["Credential"].AsString();
118 118
119 if (password == credential || "$1$" + Utils.MD5String(password) == credential || Utils.MD5String(password) == credential) 119 if (password == credential || "$1$" + password == credential || "$1$" + Utils.MD5String(password) == credential || Utils.MD5String(password) == credential)
120 return Authorize(principalID); 120 return Authorize(principalID);
121 121
122 md5hashFound = true; 122 md5hashFound = true;