Merge branch 'master' into careminster

This commit is contained in:
Melanie
2012-12-09 21:27:32 +00:00
23 changed files with 1356 additions and 94 deletions

View File

@@ -315,7 +315,7 @@ namespace OpenSim.Services.Connectors.Simulation
try
{
OSDMap result = WebUtil.ServiceOSDRequest(uri, request, "QUERYACCESS", 10000, false);
OSDMap result = WebUtil.ServiceOSDRequest(uri, request, "QUERYACCESS", 30000, false);
bool success = result["success"].AsBoolean();
if (result.ContainsKey("_Result"))
{