From fd23f270c6914b7aa628f96daa9608745d3a20b3 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 13 Aug 2010 21:01:10 +0100
Subject: refactor: remove Scene.SetRootAgentScene() in favour of existing
 event with same name

---
 .../Avatar/Inventory/Transfer/InventoryTransferModule.cs  | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Avatar/Inventory')

diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index 2f1e9dd..8b77a5f 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -82,6 +82,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
             scene.EventManager.OnNewClient += OnNewClient;
             scene.EventManager.OnClientClosed += ClientLoggedOut;
             scene.EventManager.OnIncomingInstantMessage += OnGridInstantMessage;
+            scene.EventManager.OnSetRootAgentScene += OnSetRootAgentScene;
         }
 
         public void RegionLoaded(Scene scene)
@@ -98,9 +99,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                     scene.EventManager.OnNewClient -= OnNewClient;
                     scene.EventManager.OnClientClosed -= ClientLoggedOut;
                     scene.EventManager.OnIncomingInstantMessage -= OnGridInstantMessage;
+                    scene.EventManager.OnSetRootAgentScene -= OnSetRootAgentScene;
                 }
             }
-
         }
 
         public void RemoveRegion(Scene scene)
@@ -108,6 +109,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
             scene.EventManager.OnNewClient -= OnNewClient;
             scene.EventManager.OnClientClosed -= ClientLoggedOut;
             scene.EventManager.OnIncomingInstantMessage -= OnGridInstantMessage;
+            scene.EventManager.OnSetRootAgentScene -= OnSetRootAgentScene;
             m_Scenelist.Remove(scene);
         }
 
@@ -136,6 +138,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
             // Inventory giving is conducted via instant message
             client.OnInstantMessage += OnInstantMessage;
         }
+        
+        protected void OnSetRootAgentScene(UUID id, Scene scene)
+        {
+            m_AgentRegions[id] = scene;
+        }
 
         private Scene FindClientScene(UUID agentId)
         {
@@ -160,7 +167,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
             if (scene == null) // Something seriously wrong here.
                 return;
 
-
             if (im.dialog == (byte) InstantMessageDialog.InventoryOffered)
             {
                 //m_log.DebugFormat("Asset type {0}", ((AssetType)im.binaryBucket[0]));
@@ -346,11 +352,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
             }
         }
 
-        public void SetRootAgentScene(UUID agentID, Scene scene)
-        {
-            m_AgentRegions[agentID] = scene;
-        }
-
         public bool NeedSceneCacheClear(UUID agentID, Scene scene)
         {
             if (!m_AgentRegions.ContainsKey(agentID))
-- 
cgit v1.1