diff options
Diffstat (limited to 'OpenSim/Region/RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs')
-rw-r--r-- | OpenSim/Region/RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs | 7 |
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 @@ | |||
28 | using System; | 28 | using System; |
29 | using OpenMetaverse; | 29 | using OpenMetaverse; |
30 | using OpenSim.Framework; | 30 | using OpenSim.Framework; |
31 | using OpenSim.Region.CoreModules.Avatar.Attachments; | ||
31 | using OpenSim.Region.Framework.Scenes; | 32 | using OpenSim.Region.Framework.Scenes; |
32 | 33 | ||
33 | namespace OpenSim.Region.RegionCombinerModule | 34 | namespace 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); |