diff options
author | Melanie Thielker | 2015-11-01 19:11:14 +0100 |
---|---|---|
committer | Melanie Thielker | 2015-11-01 19:11:14 +0100 |
commit | 69585a4824a7814bbe543d624de6c3627e0b927b (patch) | |
tree | 5d4bb6480906000f019c0d456939b24f5dfd8ab4 /OpenSim/Server | |
parent | Merge branch 'master' into avinationmerge (diff) | |
download | opensim-SC-69585a4824a7814bbe543d624de6c3627e0b927b.zip opensim-SC-69585a4824a7814bbe543d624de6c3627e0b927b.tar.gz opensim-SC-69585a4824a7814bbe543d624de6c3627e0b927b.tar.bz2 opensim-SC-69585a4824a7814bbe543d624de6c3627e0b927b.tar.xz |
More plumbing of the EntityTransferContext (not yet complete)
Diffstat (limited to 'OpenSim/Server')
-rw-r--r-- | OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs index 0e6710d..f6a7e19 100644 --- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs +++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | |||
@@ -461,6 +461,7 @@ namespace OpenSim.Server.Handlers.Simulation | |||
461 | // This is the meaning of POST agent | 461 | // This is the meaning of POST agent |
462 | //m_regionClient.AdjustUserInformation(aCircuit); | 462 | //m_regionClient.AdjustUserInformation(aCircuit); |
463 | //bool result = m_SimulationService.CreateAgent(destination, aCircuit, teleportFlags, out reason); | 463 | //bool result = m_SimulationService.CreateAgent(destination, aCircuit, teleportFlags, out reason); |
464 | |||
464 | bool result = CreateAgent(source, gatekeeper, destination, aCircuit, data.flags, data.fromLogin, out reason); | 465 | bool result = CreateAgent(source, gatekeeper, destination, aCircuit, data.flags, data.fromLogin, out reason); |
465 | 466 | ||
466 | resp["reason"] = OSD.FromString(reason); | 467 | resp["reason"] = OSD.FromString(reason); |
@@ -539,12 +540,15 @@ namespace OpenSim.Server.Handlers.Simulation | |||
539 | AgentCircuitData aCircuit, uint teleportFlags, bool fromLogin, out string reason) | 540 | AgentCircuitData aCircuit, uint teleportFlags, bool fromLogin, out string reason) |
540 | { | 541 | { |
541 | reason = String.Empty; | 542 | reason = String.Empty; |
543 | // The data and protocols are already defined so this is just a dummy to satisfy the interface | ||
544 | // TODO: make this end-to-end | ||
545 | EntityTransferContext ctx = new EntityTransferContext(); | ||
542 | if ((teleportFlags & (uint)TeleportFlags.ViaLogin) == 0) | 546 | if ((teleportFlags & (uint)TeleportFlags.ViaLogin) == 0) |
543 | { | 547 | { |
544 | Util.FireAndForget(x => | 548 | Util.FireAndForget(x => |
545 | { | 549 | { |
546 | string r; | 550 | string r; |
547 | m_SimulationService.CreateAgent(source, destination, aCircuit, teleportFlags, out r); | 551 | m_SimulationService.CreateAgent(source, destination, aCircuit, teleportFlags, ctx, out r); |
548 | m_log.DebugFormat("[AGENT HANDLER]: ASYNC CreateAgent {0}", r); | 552 | m_log.DebugFormat("[AGENT HANDLER]: ASYNC CreateAgent {0}", r); |
549 | }); | 553 | }); |
550 | 554 | ||
@@ -553,7 +557,7 @@ namespace OpenSim.Server.Handlers.Simulation | |||
553 | else | 557 | else |
554 | { | 558 | { |
555 | 559 | ||
556 | bool ret = m_SimulationService.CreateAgent(source, destination, aCircuit, teleportFlags, out reason); | 560 | bool ret = m_SimulationService.CreateAgent(source, destination, aCircuit, teleportFlags, ctx, out reason); |
557 | m_log.DebugFormat("[AGENT HANDLER]: SYNC CreateAgent {0} {1}", ret.ToString(), reason); | 561 | m_log.DebugFormat("[AGENT HANDLER]: SYNC CreateAgent {0} {1}", ret.ToString(), reason); |
558 | return ret; | 562 | return ret; |
559 | } | 563 | } |
@@ -739,7 +743,10 @@ namespace OpenSim.Server.Handlers.Simulation | |||
739 | // subclasses can override this | 743 | // subclasses can override this |
740 | protected virtual bool UpdateAgent(GridRegion destination, AgentData agent) | 744 | protected virtual bool UpdateAgent(GridRegion destination, AgentData agent) |
741 | { | 745 | { |
742 | return m_SimulationService.UpdateAgent(destination, agent); | 746 | // The data and protocols are already defined so this is just a dummy to satisfy the interface |
747 | // TODO: make this end-to-end | ||
748 | EntityTransferContext ctx = new EntityTransferContext(); | ||
749 | return m_SimulationService.UpdateAgent(destination, agent, ctx); | ||
743 | } | 750 | } |
744 | } | 751 | } |
745 | 752 | ||