From 9688db2f687b04623fa61580307da35f90df9d4c Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 8 May 2011 20:20:00 +0100
Subject: Enable compressed (gzip) fatpack transfers.

---
 .../Simulation/SimulationServiceConnector.cs          | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Services/Connectors/Simulation')

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
                 args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString());
                 args["teleport_flags"] = OSD.FromString(flags.ToString());
 
-                OSDMap result = WebUtil.PostToService(uri, args, 20000);
+                OSDMap result = WebUtil.PostToServiceCompressed(uri, args, 30000);
                 if (result["Success"].AsBoolean())
                     return true;
                 
+                result = WebUtil.PostToService(uri, args, 30000);
+
+                if (result["Success"].AsBoolean())
+                {
+                    m_log.WarnFormat(
+                    "[REMOTE SIMULATION CONNECTOR]: Remote simulator {0} did not accept compressed transfer, suggest updating it.", destination.RegionName);
+                    return true;
+                }
+                
                 m_log.WarnFormat(
-                    "[REMOTE SIMULATION CONNECTOR]: Failed to create agent {0} {1} at remote simulator {1}", 
+                    "[REMOTE SIMULATION CONNECTOR]: Failed to create agent {0} {1} at remote simulator {2}", 
                     aCircuit.firstname, aCircuit.lastname, destination.RegionName);                       
                 reason = result["Message"] != null ? result["Message"].AsString() : "error";
                 return false;
@@ -274,7 +283,7 @@ namespace OpenSim.Services.Connectors.Simulation
 
             try
             {
-                OSDMap result = WebUtil.ServiceOSDRequest(uri, request, "QUERYACCESS", 10000);
+                OSDMap result = WebUtil.ServiceOSDRequest(uri, request, "QUERYACCESS", 10000, false);
                 bool success = result["success"].AsBoolean();
                 if (result.ContainsKey("_Result"))
                 {
@@ -326,7 +335,7 @@ namespace OpenSim.Services.Connectors.Simulation
 
             try
             {
-                WebUtil.ServiceOSDRequest(uri, null, "DELETE", 10000);
+                WebUtil.ServiceOSDRequest(uri, null, "DELETE", 10000, false);
             }
             catch (Exception e)
             {
@@ -346,7 +355,7 @@ namespace OpenSim.Services.Connectors.Simulation
 
             try
             {
-                WebUtil.ServiceOSDRequest(uri, null, "DELETE", 10000);
+                WebUtil.ServiceOSDRequest(uri, null, "DELETE", 10000, false);
             }
             catch (Exception e)
             {
-- 
cgit v1.1