diff options
author | Melanie Thielker | 2009-05-19 16:26:20 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-05-19 16:26:20 +0000 |
commit | 88f17010b77f3f955fe0f7ca6b4088d71f59eae2 (patch) | |
tree | 7fa52b43efbf6ebb23a8d0e2cbee12b06625613c /OpenSim/Region | |
parent | Sculpt mesher refactor (diff) | |
download | opensim-SC-88f17010b77f3f955fe0f7ca6b4088d71f59eae2.zip opensim-SC-88f17010b77f3f955fe0f7ca6b4088d71f59eae2.tar.gz opensim-SC-88f17010b77f3f955fe0f7ca6b4088d71f59eae2.tar.bz2 opensim-SC-88f17010b77f3f955fe0f7ca6b4088d71f59eae2.tar.xz |
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
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs | 7 |
1 files changed, 7 insertions, 0 deletions
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 | |||
41 | private bool m_dumpAssetsToFile = false; | 41 | private bool m_dumpAssetsToFile = false; |
42 | private Scene m_scene = null; | 42 | private Scene m_scene = null; |
43 | 43 | ||
44 | [Obsolete] | ||
44 | public Scene MyScene | 45 | public Scene MyScene |
45 | { | 46 | { |
46 | get{ return m_scene;} | 47 | get{ return m_scene;} |
@@ -70,6 +71,12 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
70 | 71 | ||
71 | scene.EventManager.OnNewClient += NewClient; | 72 | scene.EventManager.OnNewClient += NewClient; |
72 | } | 73 | } |
74 | |||
75 | // EVIL HACK! | ||
76 | // This needs killing! | ||
77 | // | ||
78 | if (m_scene == null) | ||
79 | m_scene = scene; | ||
73 | } | 80 | } |
74 | 81 | ||
75 | public void PostInitialise() | 82 | public void PostInitialise() |