aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-08-13 21:01:10 +0100
committerJustin Clark-Casey (justincc)2010-08-13 21:01:10 +0100
commitfd23f270c6914b7aa628f96daa9608745d3a20b3 (patch)
treed57a8b817c3365392d337b6e1592b69d12bbc471 /OpenSim/Region/Framework/Scenes
parentrefactor: move more map tile generation code from scene to IWorldMapModule (diff)
downloadopensim-SC_OLD-fd23f270c6914b7aa628f96daa9608745d3a20b3.zip
opensim-SC_OLD-fd23f270c6914b7aa628f96daa9608745d3a20b3.tar.gz
opensim-SC_OLD-fd23f270c6914b7aa628f96daa9608745d3a20b3.tar.bz2
opensim-SC_OLD-fd23f270c6914b7aa628f96daa9608745d3a20b3.tar.xz
refactor: remove Scene.SetRootAgentScene() in favour of existing event with same name
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs11
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
2 files changed, 1 insertions, 12 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 4d5c1e7..631046a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4487,17 +4487,6 @@ namespace OpenSim.Region.Framework.Scenes
4487 client.SendLayerData(patchX, patchY, Heightmap.GetFloatsSerialised()); 4487 client.SendLayerData(patchX, patchY, Heightmap.GetFloatsSerialised());
4488 } 4488 }
4489 4489
4490 public void SetRootAgentScene(UUID agentID)
4491 {
4492 IInventoryTransferModule inv = RequestModuleInterface<IInventoryTransferModule>();
4493 if (inv == null)
4494 return;
4495
4496 inv.SetRootAgentScene(agentID, this);
4497
4498 EventManager.TriggerSetRootAgentScene(agentID, this);
4499 }
4500
4501 public bool NeedSceneCacheClear(UUID agentID) 4490 public bool NeedSceneCacheClear(UUID agentID)
4502 { 4491 {
4503 IInventoryTransferModule inv = RequestModuleInterface<IInventoryTransferModule>(); 4492 IInventoryTransferModule inv = RequestModuleInterface<IInventoryTransferModule>();
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 14d7d6a..08c6e27 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -821,7 +821,7 @@ namespace OpenSim.Region.Framework.Scenes
821 821
822 m_rootRegionHandle = m_scene.RegionInfo.RegionHandle; 822 m_rootRegionHandle = m_scene.RegionInfo.RegionHandle;
823 823
824 m_scene.SetRootAgentScene(m_uuid); 824 m_scene.EventManager.TriggerSetRootAgentScene(m_uuid, m_scene);
825 825
826 // Moved this from SendInitialData to ensure that m_appearance is initialized 826 // Moved this from SendInitialData to ensure that m_appearance is initialized
827 // before the inventory is processed in MakeRootAgent. This fixes a race condition 827 // before the inventory is processed in MakeRootAgent. This fixes a race condition