From 88f17010b77f3f955fe0f7ca6b4088d71f59eae2 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Tue, 19 May 2009 16:26:20 +0000
Subject: Add initializing m_scene if it's not null. Marking MyScene as
 [Obsolete] because it will be removed soonish. This is NOT the way to go.
 Thanks, mpallari, for pointing this out. Fixes Mantis #3684

---
 .../CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs   | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'OpenSim/Region/CoreModules')

diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
index 96271a3..523de75 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
@@ -41,6 +41,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
         private bool m_dumpAssetsToFile = false;
         private Scene m_scene = null;
 
+        [Obsolete]
         public Scene MyScene
         {
             get{ return m_scene;}
@@ -70,6 +71,12 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
 
                 scene.EventManager.OnNewClient += NewClient;
             }
+
+            // EVIL HACK!
+            // This needs killing!
+            //
+            if (m_scene == null)
+                m_scene = scene;
         }
 
         public void PostInitialise()
-- 
cgit v1.1