aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers
diff options
context:
space:
mode:
authorMelanie Thielker2015-11-01 19:37:14 +0100
committerMelanie Thielker2015-11-01 19:37:14 +0100
commit5f18f2ce6a4308fe30de8b7816058bd5d4b962ca (patch)
treeb41362f4ea4942110f6ccb5260dc3e2697d20686 /OpenSim/Server/Handlers
parentMore plumbing of the EntityTransferContext (not yet complete) (diff)
downloadopensim-SC_OLD-5f18f2ce6a4308fe30de8b7816058bd5d4b962ca.zip
opensim-SC_OLD-5f18f2ce6a4308fe30de8b7816058bd5d4b962ca.tar.gz
opensim-SC_OLD-5f18f2ce6a4308fe30de8b7816058bd5d4b962ca.tar.bz2
opensim-SC_OLD-5f18f2ce6a4308fe30de8b7816058bd5d4b962ca.tar.xz
More EntityTransferContext plumbing
Diffstat (limited to 'OpenSim/Server/Handlers')
-rw-r--r--OpenSim/Server/Handlers/Simulation/AgentHandlers.cs8
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index f6a7e19..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
262 resp["version"] = OSD.FromString(legacyVersion); 262 resp["version"] = OSD.FromString(legacyVersion);
263 resp["negotiated_inbound_version"] = OSD.FromReal(inboundVersion); 263 resp["negotiated_inbound_version"] = OSD.FromReal(inboundVersion);
264 resp["negotiated_outbound_version"] = OSD.FromReal(outboundVersion); 264 resp["negotiated_outbound_version"] = OSD.FromReal(outboundVersion);
265 resp["variable_wearables_count_supported"] = OSD.FromBoolean(true);
266 265
267 OSDArray featuresWanted = new OSDArray(); 266 OSDArray featuresWanted = new OSDArray();
268 foreach (UUID feature in features) 267 foreach (UUID feature in features)
@@ -661,6 +660,9 @@ namespace OpenSim.Server.Handlers.Simulation
661 660
662 protected void DoAgentPut(Hashtable request, Hashtable responsedata) 661 protected void DoAgentPut(Hashtable request, Hashtable responsedata)
663 { 662 {
663 // TODO: Encode the ENtityTransferContext
664 EntityTransferContext ctx = new EntityTransferContext();
665
664 OSDMap args = Utils.GetOSDMap((string)request["body"]); 666 OSDMap args = Utils.GetOSDMap((string)request["body"]);
665 if (args == null) 667 if (args == null)
666 { 668 {
@@ -703,7 +705,7 @@ namespace OpenSim.Server.Handlers.Simulation
703 AgentData agent = new AgentData(); 705 AgentData agent = new AgentData();
704 try 706 try
705 { 707 {
706 agent.Unpack(args, m_SimulationService.GetScene(destination.RegionID)); 708 agent.Unpack(args, m_SimulationService.GetScene(destination.RegionID), ctx);
707 } 709 }
708 catch (Exception ex) 710 catch (Exception ex)
709 { 711 {
@@ -722,7 +724,7 @@ namespace OpenSim.Server.Handlers.Simulation
722 AgentPosition agent = new AgentPosition(); 724 AgentPosition agent = new AgentPosition();
723 try 725 try
724 { 726 {
725 agent.Unpack(args, m_SimulationService.GetScene(destination.RegionID)); 727 agent.Unpack(args, m_SimulationService.GetScene(destination.RegionID), ctx);
726 } 728 }
727 catch (Exception ex) 729 catch (Exception ex)
728 { 730 {