aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
diff options
context:
space:
mode:
authorDiva Canto2012-04-06 20:34:31 -0700
committerDiva Canto2012-04-06 20:34:31 -0700
commit9637e509567efe512d4b29ea925c10011cdbe99e (patch)
tree405eaf60308ba06c3ba40a792ecfe17d20495d01 /OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
parentDeleted the unused and commented code from 2 commits ago. (diff)
downloadopensim-SC_OLD-9637e509567efe512d4b29ea925c10011cdbe99e.zip
opensim-SC_OLD-9637e509567efe512d4b29ea925c10011cdbe99e.tar.gz
opensim-SC_OLD-9637e509567efe512d4b29ea925c10011cdbe99e.tar.bz2
opensim-SC_OLD-9637e509567efe512d4b29ea925c10011cdbe99e.tar.xz
Moved the inventory manipulation from HGEntityTransferModule to HGInventoryAccessModule where it belongs. They need to exchange some events, so added those to EventManager. Those events (TeleportStart and TeleportFail) are nice to have anyway.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs8
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 86e10d4..fa9cd55 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -561,12 +561,18 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
561 // Finally, kill the agent we just created at the destination. 561 // Finally, kill the agent we just created at the destination.
562 m_aScene.SimulationService.CloseAgent(finalDestination, sp.UUID); 562 m_aScene.SimulationService.CloseAgent(finalDestination, sp.UUID);
563 563
564 sp.Scene.EventManager.TriggerTeleportFail(sp.ControllingClient, logout);
564 } 565 }
565 566
566 protected virtual bool CreateAgent(ScenePresence sp, GridRegion reg, GridRegion finalDestination, AgentCircuitData agentCircuit, uint teleportFlags, out string reason, out bool logout) 567 protected virtual bool CreateAgent(ScenePresence sp, GridRegion reg, GridRegion finalDestination, AgentCircuitData agentCircuit, uint teleportFlags, out string reason, out bool logout)
567 { 568 {
568 logout = false; 569 logout = false;
569 return m_aScene.SimulationService.CreateAgent(finalDestination, agentCircuit, teleportFlags, out reason); 570 bool success = m_aScene.SimulationService.CreateAgent(finalDestination, agentCircuit, teleportFlags, out reason);
571
572 if (success)
573 sp.Scene.EventManager.TriggerTeleportStart(sp.ControllingClient, reg, finalDestination, teleportFlags, logout);
574
575 return success;
570 } 576 }
571 577
572 protected virtual bool UpdateAgent(GridRegion reg, GridRegion finalDestination, AgentData agent) 578 protected virtual bool UpdateAgent(GridRegion reg, GridRegion finalDestination, AgentData agent)