diff options
| author | Melanie | 2011-05-03 14:26:18 +0100 |
|---|---|---|
| committer | Melanie | 2011-05-03 14:26:18 +0100 |
| commit | af55eda16b1025796a61289a0ab84b26e6444627 (patch) | |
| tree | 6449c15b8f54240cfef62d606fab88a185f75f03 /OpenSim/Services/Connectors/Hypergrid | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Increased timeout for fat UpdateAgent to 200secs. Nebadon's 3800-prim alien a... (diff) | |
| download | opensim-SC-af55eda16b1025796a61289a0ab84b26e6444627.zip opensim-SC-af55eda16b1025796a61289a0ab84b26e6444627.tar.gz opensim-SC-af55eda16b1025796a61289a0ab84b26e6444627.tar.bz2 opensim-SC-af55eda16b1025796a61289a0ab84b26e6444627.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/Connectors/Hypergrid')
| -rw-r--r-- | OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs index 1aa3282..bc0bc54 100644 --- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs | |||
| @@ -306,7 +306,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
| 306 | args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString()); | 306 | args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString()); |
| 307 | args["teleport_flags"] = OSD.FromString(flags.ToString()); | 307 | args["teleport_flags"] = OSD.FromString(flags.ToString()); |
| 308 | 308 | ||
| 309 | OSDMap result = WebUtil.PostToService(uri,args); | 309 | OSDMap result = WebUtil.PostToService(uri, args, 20000); |
| 310 | if (result["Success"].AsBoolean()) | 310 | if (result["Success"].AsBoolean()) |
| 311 | { | 311 | { |
| 312 | OSDMap unpacked = (OSDMap)result["_Result"]; | 312 | OSDMap unpacked = (OSDMap)result["_Result"]; |