aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/RegionCombinerModule
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-07-30 21:41:44 +0100
committerJustin Clark-Casey (justincc)2010-07-30 21:41:44 +0100
commit424b4b2b8663f0f6780d2d3a2656e5b298418711 (patch)
treef608b701dc73df59161a0585a65c297b9c069bc4 /OpenSim/Region/RegionCombinerModule
parentremove unused BasicQuadTreeNode (diff)
downloadopensim-SC_OLD-424b4b2b8663f0f6780d2d3a2656e5b298418711.zip
opensim-SC_OLD-424b4b2b8663f0f6780d2d3a2656e5b298418711.tar.gz
opensim-SC_OLD-424b4b2b8663f0f6780d2d3a2656e5b298418711.tar.bz2
opensim-SC_OLD-424b4b2b8663f0f6780d2d3a2656e5b298418711.tar.xz
move attachment subscription events into AttachmentsModule from scene.
restored to some heavy casting in order to preserve RegionCombinerModule semantics, pending better events.
Diffstat (limited to 'OpenSim/Region/RegionCombinerModule')
-rw-r--r--OpenSim/Region/RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs
index 9d41c9c..62410e2 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs
@@ -28,11 +28,12 @@
28using System; 28using System;
29using OpenMetaverse; 29using OpenMetaverse;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Region.CoreModules.Avatar.Attachments;
31using OpenSim.Region.Framework.Scenes; 32using OpenSim.Region.Framework.Scenes;
32 33
33namespace OpenSim.Region.RegionCombinerModule 34namespace OpenSim.Region.RegionCombinerModule
34{ 35{
35 public class RegionCombinerIndividualEventForwarder 36 public class RegionCombinerIndividualEventForwarder
36 { 37 {
37 private Scene m_rootScene; 38 private Scene m_rootScene;
38 private Scene m_virtScene; 39 private Scene m_virtScene;
@@ -48,7 +49,7 @@ namespace OpenSim.Region.RegionCombinerModule
48 m_virtScene.UnSubscribeToClientPrimEvents(client); 49 m_virtScene.UnSubscribeToClientPrimEvents(client);
49 m_virtScene.UnSubscribeToClientPrimRezEvents(client); 50 m_virtScene.UnSubscribeToClientPrimRezEvents(client);
50 m_virtScene.UnSubscribeToClientInventoryEvents(client); 51 m_virtScene.UnSubscribeToClientInventoryEvents(client);
51 m_virtScene.UnSubscribeToClientAttachmentEvents(client); 52 ((AttachmentsModule)m_virtScene.AttachmentsModule).UnsubscribeFromClientEvents(client);
52 //m_virtScene.UnSubscribeToClientTeleportEvents(client); 53 //m_virtScene.UnSubscribeToClientTeleportEvents(client);
53 m_virtScene.UnSubscribeToClientScriptEvents(client); 54 m_virtScene.UnSubscribeToClientScriptEvents(client);
54 m_virtScene.UnSubscribeToClientGodEvents(client); 55 m_virtScene.UnSubscribeToClientGodEvents(client);
@@ -58,7 +59,7 @@ namespace OpenSim.Region.RegionCombinerModule
58 client.OnAddPrim += LocalAddNewPrim; 59 client.OnAddPrim += LocalAddNewPrim;
59 client.OnRezObject += LocalRezObject; 60 client.OnRezObject += LocalRezObject;
60 m_rootScene.SubscribeToClientInventoryEvents(client); 61 m_rootScene.SubscribeToClientInventoryEvents(client);
61 m_rootScene.SubscribeToClientAttachmentEvents(client); 62 ((AttachmentsModule)m_rootScene.AttachmentsModule).SubscribeToClientEvents(client);
62 //m_rootScene.SubscribeToClientTeleportEvents(client); 63 //m_rootScene.SubscribeToClientTeleportEvents(client);
63 m_rootScene.SubscribeToClientScriptEvents(client); 64 m_rootScene.SubscribeToClientScriptEvents(client);
64 m_rootScene.SubscribeToClientGodEvents(client); 65 m_rootScene.SubscribeToClientGodEvents(client);