diff options
| author | Melanie | 2012-11-09 22:58:42 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-09 22:58:42 +0000 |
| commit | 415b89f434657fe4cbf62a5c99f24c2648a313ac (patch) | |
| tree | 48d7e97cc64a4351755942745a9a8f65d52b5322 /OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | llSetLinkCamera implementation (diff) | |
| download | opensim-SC_OLD-415b89f434657fe4cbf62a5c99f24c2648a313ac.zip opensim-SC_OLD-415b89f434657fe4cbf62a5c99f24c2648a313ac.tar.gz opensim-SC_OLD-415b89f434657fe4cbf62a5c99f24c2648a313ac.tar.bz2 opensim-SC_OLD-415b89f434657fe4cbf62a5c99f24c2648a313ac.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs')
| -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 4cd933c..d840527 100644 --- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs | |||
| @@ -321,7 +321,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
| 321 | args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString()); | 321 | args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString()); |
| 322 | args["teleport_flags"] = OSD.FromString(flags.ToString()); | 322 | args["teleport_flags"] = OSD.FromString(flags.ToString()); |
| 323 | 323 | ||
| 324 | OSDMap result = WebUtil.PostToService(uri, args, 20000); | 324 | OSDMap result = WebUtil.PostToService(uri, args, 80000); |
| 325 | if (result["Success"].AsBoolean()) | 325 | if (result["Success"].AsBoolean()) |
| 326 | { | 326 | { |
| 327 | OSDMap unpacked = (OSDMap)result["_Result"]; | 327 | OSDMap unpacked = (OSDMap)result["_Result"]; |