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
0.6.6-post-fixes
Melanie Thielker 2009-05-19 16:26:20 +00:00
parent 87b95e324e
commit 88f17010b7
1 changed files with 7 additions and 0 deletions

View File

@ -41,6 +41,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
private bool m_dumpAssetsToFile = false; private bool m_dumpAssetsToFile = false;
private Scene m_scene = null; private Scene m_scene = null;
[Obsolete]
public Scene MyScene public Scene MyScene
{ {
get{ return m_scene;} get{ return m_scene;}
@ -70,6 +71,12 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
scene.EventManager.OnNewClient += NewClient; scene.EventManager.OnNewClient += NewClient;
} }
// EVIL HACK!
// This needs killing!
//
if (m_scene == null)
m_scene = scene;
} }
public void PostInitialise() public void PostInitialise()