diff options
| author | BlueWall | 2012-12-07 15:36:43 -0500 |
|---|---|---|
| committer | BlueWall | 2012-12-07 15:36:43 -0500 |
| commit | 0b455d2882a51ce0841d003f12d4c35ad9edb753 (patch) | |
| tree | c48c95f48786f8fe435fc5c90477ac3b7c9eaf6c /OpenSim/Services/Connectors | |
| parent | Merge branch 'master' into connector_plugin (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-0b455d2882a51ce0841d003f12d4c35ad9edb753.zip opensim-SC_OLD-0b455d2882a51ce0841d003f12d4c35ad9edb753.tar.gz opensim-SC_OLD-0b455d2882a51ce0841d003f12d4c35ad9edb753.tar.bz2 opensim-SC_OLD-0b455d2882a51ce0841d003f12d4c35ad9edb753.tar.xz | |
Merge branch 'master' into connector_plugin
Diffstat (limited to 'OpenSim/Services/Connectors')
| -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 95c4f87..57f2ffa 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
| @@ -314,7 +314,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
| 314 | 314 | ||
| 315 | try | 315 | try |
| 316 | { | 316 | { |
| 317 | OSDMap result = WebUtil.ServiceOSDRequest(uri, request, "QUERYACCESS", 10000, false); | 317 | OSDMap result = WebUtil.ServiceOSDRequest(uri, request, "QUERYACCESS", 30000, false); |
| 318 | bool success = result["success"].AsBoolean(); | 318 | bool success = result["success"].AsBoolean(); |
| 319 | if (result.ContainsKey("_Result")) | 319 | if (result.ContainsKey("_Result")) |
| 320 | { | 320 | { |