Merge branch 'master' into caps

author: Diva Canto 2011-05-02 11:56:51 -0700
committer: Diva Canto 2011-05-02 11:56:51 -0700
commit: 2d403d5b187c9598b61f24055442cf7467e2b734 (patch)
tree: fe0ea9137a365a2c8fbb7237d449898f58899702 /OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
parent: Refactored the GetMesh module into a handler and a module, to be the same as ... (diff)
parent: Increased timeout for fat UpdateAgent to 200secs. Nebadon's 3800-prim alien a... (diff)
download: opensim-SC_OLD-2d403d5b187c9598b61f24055442cf7467e2b734.zip
opensim-SC_OLD-2d403d5b187c9598b61f24055442cf7467e2b734.tar.gz
opensim-SC_OLD-2d403d5b187c9598b61f24055442cf7467e2b734.tar.bz2
opensim-SC_OLD-2d403d5b187c9598b61f24055442cf7467e2b734.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
index 8ab323a..0430ef6 100644
--- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
@@ -314,7 +314,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
                args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString());
                args["teleport_flags"] = OSD.FromString(flags.ToString());
-                OSDMap result = WebUtil.PostToService(uri,args);
+                OSDMap result = WebUtil.PostToService(uri, args, 20000);
                if (result["Success"].AsBoolean())
                {
                    OSDMap unpacked = (OSDMap)result["_Result"];
author	Diva Canto	2011-05-02 11:56:51 -0700
committer	Diva Canto	2011-05-02 11:56:51 -0700
commit	2d403d5b187c9598b61f24055442cf7467e2b734 (patch)
tree	fe0ea9137a365a2c8fbb7237d449898f58899702 /OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
parent	Refactored the GetMesh module into a handler and a module, to be the same as ... (diff)
parent	Increased timeout for fat UpdateAgent to 200secs. Nebadon's 3800-prim alien a... (diff)
download	opensim-SC_OLD-2d403d5b187c9598b61f24055442cf7467e2b734.zip opensim-SC_OLD-2d403d5b187c9598b61f24055442cf7467e2b734.tar.gz opensim-SC_OLD-2d403d5b187c9598b61f24055442cf7467e2b734.tar.bz2 opensim-SC_OLD-2d403d5b187c9598b61f24055442cf7467e2b734.tar.xz

diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs index 8ab323a..0430ef6 100644 --- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
@@ -314,7 +314,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
314	args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString());	314	args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString());
315	args["teleport_flags"] = OSD.FromString(flags.ToString());	315	args["teleport_flags"] = OSD.FromString(flags.ToString());
316		316
317	OSDMap result = WebUtil.PostToService(uri,args);	317	OSDMap result = WebUtil.PostToService(uri, args, 20000);
318	if (result["Success"].AsBoolean())	318	if (result["Success"].AsBoolean())
319	{	319	{
320	OSDMap unpacked = (OSDMap)result["_Result"];	320	OSDMap unpacked = (OSDMap)result["_Result"];