From 424b4b2b8663f0f6780d2d3a2656e5b298418711 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 30 Jul 2010 21:41:44 +0100
Subject: move attachment subscription events into AttachmentsModule from
 scene.

restored to some heavy casting in order to preserve RegionCombinerModule semantics, pending better events.
---
 .../RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/RegionCombinerModule')

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 @@
 using System;
 using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Region.CoreModules.Avatar.Attachments;
 using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.RegionCombinerModule
 {
- public class RegionCombinerIndividualEventForwarder
+    public class RegionCombinerIndividualEventForwarder
     {
         private Scene m_rootScene;
         private Scene m_virtScene;
@@ -48,7 +49,7 @@ namespace OpenSim.Region.RegionCombinerModule
             m_virtScene.UnSubscribeToClientPrimEvents(client);
             m_virtScene.UnSubscribeToClientPrimRezEvents(client);
             m_virtScene.UnSubscribeToClientInventoryEvents(client);
-            m_virtScene.UnSubscribeToClientAttachmentEvents(client);
+            ((AttachmentsModule)m_virtScene.AttachmentsModule).UnsubscribeFromClientEvents(client);
             //m_virtScene.UnSubscribeToClientTeleportEvents(client);
             m_virtScene.UnSubscribeToClientScriptEvents(client);
             m_virtScene.UnSubscribeToClientGodEvents(client);
@@ -58,7 +59,7 @@ namespace OpenSim.Region.RegionCombinerModule
             client.OnAddPrim += LocalAddNewPrim;
             client.OnRezObject += LocalRezObject;
             m_rootScene.SubscribeToClientInventoryEvents(client);
-            m_rootScene.SubscribeToClientAttachmentEvents(client);
+            ((AttachmentsModule)m_rootScene.AttachmentsModule).SubscribeToClientEvents(client);
             //m_rootScene.SubscribeToClientTeleportEvents(client);
             m_rootScene.SubscribeToClientScriptEvents(client);
             m_rootScene.SubscribeToClientGodEvents(client);
-- 
cgit v1.1