Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2011-02-19 01:59:49 +00:00
18 changed files with 585 additions and 418 deletions

View File

@@ -185,7 +185,7 @@ namespace OpenSim.Services.Connectors.Simulation
}
// unreachable
return true;
// return true;
}
/// <summary>
@@ -274,7 +274,11 @@ namespace OpenSim.Services.Connectors.Simulation
try
{
OSDMap result = WebUtil.ServiceOSDRequest(uri, request, "QUERYACCESS", 10000);
bool success = result["Success"].AsBoolean();
bool success = result["success"].AsBoolean();
reason = result["reason"].AsString();
//m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: QueryAccess to {0} returned {1}", uri, success);
if (!success)
{
if (result.ContainsKey("Message"))