diff options
| author | Melanie | 2012-12-09 21:27:32 +0000 |
|---|---|---|
| committer | Melanie | 2012-12-09 21:27:32 +0000 |
| commit | f30d519bcc1e68deee0d5b3671766ceb39a37018 (patch) | |
| tree | e082cd09c815191377d840b1c2936f5e558e45b0 /OpenSim/Services/Connectors/Simulation | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Restrict IPresenceData.VerifyAgent (diff) | |
| download | opensim-SC_OLD-f30d519bcc1e68deee0d5b3671766ceb39a37018.zip opensim-SC_OLD-f30d519bcc1e68deee0d5b3671766ceb39a37018.tar.gz opensim-SC_OLD-f30d519bcc1e68deee0d5b3671766ceb39a37018.tar.bz2 opensim-SC_OLD-f30d519bcc1e68deee0d5b3671766ceb39a37018.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Services/Connectors/Simulation')
| -rw-r--r-- | OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index 508baf7..ef2494a 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
| @@ -315,7 +315,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
| 315 | 315 | ||
| 316 | try | 316 | try |
| 317 | { | 317 | { |
| 318 | OSDMap result = WebUtil.ServiceOSDRequest(uri, request, "QUERYACCESS", 10000, false); | 318 | OSDMap result = WebUtil.ServiceOSDRequest(uri, request, "QUERYACCESS", 30000, false); |
| 319 | bool success = result["success"].AsBoolean(); | 319 | bool success = result["success"].AsBoolean(); |
| 320 | if (result.ContainsKey("_Result")) | 320 | if (result.ContainsKey("_Result")) |
| 321 | { | 321 | { |