Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-12-30 01:40:38 +00:00
13 changed files with 91 additions and 93 deletions

View File

@@ -330,10 +330,12 @@ namespace OpenSim.Services.HypergridService
if (parts.Length < 2)
return false;
string addressee = parts[0];
m_log.DebugFormat("[GATEKEEPER SERVICE]: Verifying {0} against {1}", addressee, m_ExternalName);
char[] trailing_slash = new char[] { '/' };
string addressee = parts[0].TrimEnd(trailing_slash);
string externalname = m_ExternalName.TrimEnd(trailing_slash);
m_log.DebugFormat("[GATEKEEPER SERVICE]: Verifying {0} against {1}", addressee, externalname);
return string.Equals(addressee, m_ExternalName, StringComparison.OrdinalIgnoreCase);
return string.Equals(addressee, externalname, StringComparison.OrdinalIgnoreCase);
}
#endregion