aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors
diff options
context:
space:
mode:
authorMelanie2011-05-08 20:20:00 +0100
committerMelanie2011-05-08 20:20:00 +0100
commit9688db2f687b04623fa61580307da35f90df9d4c (patch)
tree04dfd6f3b78de8489e10467a9d42326dd6418bcf /OpenSim/Services/Connectors
parentFix up nant linux build break (diff)
downloadopensim-SC_OLD-9688db2f687b04623fa61580307da35f90df9d4c.zip
opensim-SC_OLD-9688db2f687b04623fa61580307da35f90df9d4c.tar.gz
opensim-SC_OLD-9688db2f687b04623fa61580307da35f90df9d4c.tar.bz2
opensim-SC_OLD-9688db2f687b04623fa61580307da35f90df9d4c.tar.xz
Enable compressed (gzip) fatpack transfers.
Diffstat (limited to 'OpenSim/Services/Connectors')
-rw-r--r--OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs19
1 files changed, 14 insertions, 5 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index cef6473..3a00c2b 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -102,12 +102,21 @@ namespace OpenSim.Services.Connectors.Simulation
102 args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString()); 102 args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString());
103 args["teleport_flags"] = OSD.FromString(flags.ToString()); 103 args["teleport_flags"] = OSD.FromString(flags.ToString());
104 104
105 OSDMap result = WebUtil.PostToService(uri, args, 20000); 105 OSDMap result = WebUtil.PostToServiceCompressed(uri, args, 30000);
106 if (result["Success"].AsBoolean()) 106 if (result["Success"].AsBoolean())
107 return true; 107 return true;
108 108
109 result = WebUtil.PostToService(uri, args, 30000);
110
111 if (result["Success"].AsBoolean())
112 {
113 m_log.WarnFormat(
114 "[REMOTE SIMULATION CONNECTOR]: Remote simulator {0} did not accept compressed transfer, suggest updating it.", destination.RegionName);
115 return true;
116 }
117
109 m_log.WarnFormat( 118 m_log.WarnFormat(
110 "[REMOTE SIMULATION CONNECTOR]: Failed to create agent {0} {1} at remote simulator {1}", 119 "[REMOTE SIMULATION CONNECTOR]: Failed to create agent {0} {1} at remote simulator {2}",
111 aCircuit.firstname, aCircuit.lastname, destination.RegionName); 120 aCircuit.firstname, aCircuit.lastname, destination.RegionName);
112 reason = result["Message"] != null ? result["Message"].AsString() : "error"; 121 reason = result["Message"] != null ? result["Message"].AsString() : "error";
113 return false; 122 return false;
@@ -274,7 +283,7 @@ namespace OpenSim.Services.Connectors.Simulation
274 283
275 try 284 try
276 { 285 {
277 OSDMap result = WebUtil.ServiceOSDRequest(uri, request, "QUERYACCESS", 10000); 286 OSDMap result = WebUtil.ServiceOSDRequest(uri, request, "QUERYACCESS", 10000, false);
278 bool success = result["success"].AsBoolean(); 287 bool success = result["success"].AsBoolean();
279 if (result.ContainsKey("_Result")) 288 if (result.ContainsKey("_Result"))
280 { 289 {
@@ -326,7 +335,7 @@ namespace OpenSim.Services.Connectors.Simulation
326 335
327 try 336 try
328 { 337 {
329 WebUtil.ServiceOSDRequest(uri, null, "DELETE", 10000); 338 WebUtil.ServiceOSDRequest(uri, null, "DELETE", 10000, false);
330 } 339 }
331 catch (Exception e) 340 catch (Exception e)
332 { 341 {
@@ -346,7 +355,7 @@ namespace OpenSim.Services.Connectors.Simulation
346 355
347 try 356 try
348 { 357 {
349 WebUtil.ServiceOSDRequest(uri, null, "DELETE", 10000); 358 WebUtil.ServiceOSDRequest(uri, null, "DELETE", 10000, false);
350 } 359 }
351 catch (Exception e) 360 catch (Exception e)
352 { 361 {