From 5f18f2ce6a4308fe30de8b7816058bd5d4b962ca Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Sun, 1 Nov 2015 19:37:14 +0100
Subject: More EntityTransferContext plumbing

---
 .../Connectors/SimianGrid/SimianAvatarServiceConnector.cs  |  3 ++-
 .../Connectors/Simulation/SimulationServiceConnector.cs    |  6 ++----
 OpenSim/Services/Interfaces/ISimulationService.cs          | 14 --------------
 3 files changed, 4 insertions(+), 19 deletions(-)

(limited to 'OpenSim/Services')

diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
index d355eab..a52dd6c 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
@@ -152,7 +152,8 @@ namespace OpenSim.Services.Connectors.SimianGrid
         // <param name=""></param>
         public bool SetAppearance(UUID userID, AvatarAppearance appearance)
         {
-            OSDMap map = appearance.Pack(-1);
+            EntityTransferContext ctx = new EntityTransferContext();
+            OSDMap map = appearance.Pack(ctx);
             if (map == null)
             {
                 m_log.WarnFormat("[SIMIAN AVATAR CONNECTOR]: Failed to encode appearance for {0}",userID);
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index bb47e6b..0ebd37e 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -121,7 +121,7 @@ namespace OpenSim.Services.Connectors.Simulation
             
             try
             {
-                OSDMap args = aCircuit.PackAgentCircuitData(-1);
+                OSDMap args = aCircuit.PackAgentCircuitData(ctx);
                 PackData(args, source, aCircuit, destination, flags);
 
                 OSDMap result = WebUtil.PostToServiceCompressed(uri, args, 30000);
@@ -260,7 +260,7 @@ namespace OpenSim.Services.Connectors.Simulation
 
             try
             {
-                OSDMap args = cAgentData.Pack();
+                OSDMap args = cAgentData.Pack(ctx);
 
                 args["destination_x"] = OSD.FromString(destination.RegionLocX.ToString());
                 args["destination_y"] = OSD.FromString(destination.RegionLocY.ToString());
@@ -347,8 +347,6 @@ namespace OpenSim.Services.Connectors.Simulation
                             ctx.OutboundVersion = float.Parse(parts[1]);
                         }
                     }
-                    if (data.ContainsKey("variable_wearables_count_supported"))
-                        ctx.VariableWearablesSupported = true;
 
                     m_log.DebugFormat(
                         "[REMOTE SIMULATION CONNECTOR]: QueryAccess to {0} returned {1}, reason {2}, version {3}/{4}",
diff --git a/OpenSim/Services/Interfaces/ISimulationService.cs b/OpenSim/Services/Interfaces/ISimulationService.cs
index 4496a9f..d89f6ff 100644
--- a/OpenSim/Services/Interfaces/ISimulationService.cs
+++ b/OpenSim/Services/Interfaces/ISimulationService.cs
@@ -34,20 +34,6 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Services.Interfaces
 {
-    public class EntityTransferContext
-    {
-        public EntityTransferContext()
-        {
-            InboundVersion = VersionInfo.SimulationServiceVersionAcceptedMax;
-            OutboundVersion = VersionInfo.SimulationServiceVersionSupportedMax;
-            VariableWearablesSupported = false;
-        }
-
-        public float InboundVersion { get; set; }
-        public float OutboundVersion { get; set; }
-        public bool VariableWearablesSupported { get; set; }
-    }
-
     public interface ISimulationService
     {
         /// <summary>
-- 
cgit v1.1