aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorDiva Canto2011-05-08 16:51:41 -0700
committerDiva Canto2011-05-08 16:51:41 -0700
commit00f10c900ac9decd48f8508e96d36f53e933ff3c (patch)
treeade93c69f3dcdeccdf96f6ecb9e901bcc2df7ae2 /OpenSim/Services
parentFix content-type to be application/x-www-form-urlencoded (diff)
parentAlso compress the actual fatpacks (diff)
downloadopensim-SC_OLD-00f10c900ac9decd48f8508e96d36f53e933ff3c.zip
opensim-SC_OLD-00f10c900ac9decd48f8508e96d36f53e933ff3c.tar.gz
opensim-SC_OLD-00f10c900ac9decd48f8508e96d36f53e933ff3c.tar.bz2
opensim-SC_OLD-00f10c900ac9decd48f8508e96d36f53e933ff3c.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index 3a00c2b..f380873 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -216,7 +216,12 @@ namespace OpenSim.Services.Connectors.Simulation
216 args["destination_name"] = OSD.FromString(destination.RegionName); 216 args["destination_name"] = OSD.FromString(destination.RegionName);
217 args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString()); 217 args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString());
218 218
219 OSDMap result = WebUtil.PutToService(uri, args, timeout); 219 OSDMap result = WebUtil.PutToServiceCompressed(uri, args, timeout);
220 if (result["Success"].AsBoolean())
221 return true;
222
223 result = WebUtil.PutToService(uri, args, timeout);
224
220 return result["Success"].AsBoolean(); 225 return result["Success"].AsBoolean();
221 } 226 }
222 catch (Exception e) 227 catch (Exception e)