1 files changed, 15 insertions, 6 deletions

diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index 0e6710d..7ab7dea 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -262,7 +262,6 @@ namespace OpenSim.Server.Handlers.Simulation
             resp["version"] = OSD.FromString(legacyVersion);
             resp["negotiated_inbound_version"] = OSD.FromReal(inboundVersion);
             resp["negotiated_outbound_version"] = OSD.FromReal(outboundVersion);
-            resp["variable_wearables_count_supported"] = OSD.FromBoolean(true);
 
             OSDArray featuresWanted = new OSDArray();
             foreach (UUID feature in features)
@@ -461,6 +460,7 @@ namespace OpenSim.Server.Handlers.Simulation
             // This is the meaning of POST agent
             //m_regionClient.AdjustUserInformation(aCircuit);
             //bool result = m_SimulationService.CreateAgent(destination, aCircuit, teleportFlags, out reason);
+
             bool result = CreateAgent(source, gatekeeper, destination, aCircuit, data.flags, data.fromLogin, out reason);
 
             resp["reason"] = OSD.FromString(reason);
@@ -539,12 +539,15 @@ namespace OpenSim.Server.Handlers.Simulation
             AgentCircuitData aCircuit, uint teleportFlags, bool fromLogin, out string reason)
         {
             reason = String.Empty;
+            // The data and protocols are already defined so this is just a dummy to satisfy the interface
+            // TODO: make this end-to-end
+            EntityTransferContext ctx = new EntityTransferContext();
             if ((teleportFlags & (uint)TeleportFlags.ViaLogin) == 0)
             {
                 Util.FireAndForget(x =>
                 {
                     string r;
-                    m_SimulationService.CreateAgent(source, destination, aCircuit, teleportFlags, out r);
+                    m_SimulationService.CreateAgent(source, destination, aCircuit, teleportFlags, ctx, out r);
                     m_log.DebugFormat("[AGENT HANDLER]: ASYNC CreateAgent {0}", r);
                 });
 
@@ -553,7 +556,7 @@ namespace OpenSim.Server.Handlers.Simulation
             else
             {
 
-                bool ret = m_SimulationService.CreateAgent(source, destination, aCircuit, teleportFlags, out reason);
+                bool ret = m_SimulationService.CreateAgent(source, destination, aCircuit, teleportFlags, ctx, out reason);
                 m_log.DebugFormat("[AGENT HANDLER]: SYNC CreateAgent {0} {1}", ret.ToString(), reason);
                 return ret;
             }
@@ -657,6 +660,9 @@ namespace OpenSim.Server.Handlers.Simulation
 
         protected void DoAgentPut(Hashtable request, Hashtable responsedata)
         {
+            // TODO: Encode the ENtityTransferContext
+            EntityTransferContext ctx = new EntityTransferContext();
+
             OSDMap args = Utils.GetOSDMap((string)request["body"]);
             if (args == null)
             {
@@ -699,7 +705,7 @@ namespace OpenSim.Server.Handlers.Simulation
                 AgentData agent = new AgentData();
                 try
                 {
-                    agent.Unpack(args, m_SimulationService.GetScene(destination.RegionID));
+                    agent.Unpack(args, m_SimulationService.GetScene(destination.RegionID), ctx);
                 }
                 catch (Exception ex)
                 {
@@ -718,7 +724,7 @@ namespace OpenSim.Server.Handlers.Simulation
                 AgentPosition agent = new AgentPosition();
                 try
                 {
-                    agent.Unpack(args, m_SimulationService.GetScene(destination.RegionID));
+                    agent.Unpack(args, m_SimulationService.GetScene(destination.RegionID), ctx);
                 }
                 catch (Exception ex)
                 {
@@ -739,7 +745,10 @@ namespace OpenSim.Server.Handlers.Simulation
         // subclasses can override this
         protected virtual bool UpdateAgent(GridRegion destination, AgentData agent)
         {
-            return m_SimulationService.UpdateAgent(destination, agent);
+            // The data and protocols are already defined so this is just a dummy to satisfy the interface
+            // TODO: make this end-to-end
+            EntityTransferContext ctx = new EntityTransferContext();
+            return m_SimulationService.UpdateAgent(destination, agent, ctx);
         }
     }