aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Hypergrid
diff options
context:
space:
mode:
authorMelanie2011-05-03 14:26:18 +0100
committerMelanie2011-05-03 14:26:18 +0100
commitaf55eda16b1025796a61289a0ab84b26e6444627 (patch)
tree6449c15b8f54240cfef62d606fab88a185f75f03 /OpenSim/Services/Connectors/Hypergrid
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentIncreased timeout for fat UpdateAgent to 200secs. Nebadon's 3800-prim alien a... (diff)
downloadopensim-SC_OLD-af55eda16b1025796a61289a0ab84b26e6444627.zip
opensim-SC_OLD-af55eda16b1025796a61289a0ab84b26e6444627.tar.gz
opensim-SC_OLD-af55eda16b1025796a61289a0ab84b26e6444627.tar.bz2
opensim-SC_OLD-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.cs2
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"];