aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Environment/Modules/AgentAssetTransactionModule.cs32
1 files changed, 23 insertions, 9 deletions
diff --git a/OpenSim/Region/Environment/Modules/AgentAssetTransactionModule.cs b/OpenSim/Region/Environment/Modules/AgentAssetTransactionModule.cs
index f29c20e..99d6db1 100644
--- a/OpenSim/Region/Environment/Modules/AgentAssetTransactionModule.cs
+++ b/OpenSim/Region/Environment/Modules/AgentAssetTransactionModule.cs
@@ -45,28 +45,42 @@ namespace OpenSim.Region.Environment.Modules
45 45
46 private AgentAssetTransactionsManager m_transactionManager; 46 private AgentAssetTransactionsManager m_transactionManager;
47 47
48 public AgentAssetTransactionModule()
49 {
50 // System.Console.WriteLine("creating AgentAssetTransactionModule");
51 }
52
48 public void Initialise(Scene scene, IConfigSource config) 53 public void Initialise(Scene scene, IConfigSource config)
49 { 54 {
50 if (!RegisteredScenes.ContainsKey(scene.RegionInfo.RegionID)) 55 if (!RegisteredScenes.ContainsKey(scene.RegionInfo.RegionID))
51 { 56 {
57 // System.Console.WriteLine("initialising AgentAssetTransactionModule");
52 RegisteredScenes.Add(scene.RegionInfo.RegionID, scene); 58 RegisteredScenes.Add(scene.RegionInfo.RegionID, scene);
53 scene.RegisterModuleInterface<IAgentAssetTransactions>(this); 59 scene.RegisterModuleInterface<IAgentAssetTransactions>(this);
54 60
55 scene.EventManager.OnNewClient += NewClient; 61 scene.EventManager.OnNewClient += NewClient;
56
57 try
58 {
59 m_dumpAssetsToFile = config.Configs["StandAlone"].GetBoolean("dump_assets_to_file", false);
60 }
61 catch (Exception)
62 {
63 }
64 } 62 }
65 63
66 if (m_scene == null) 64 if (m_scene == null)
67 { 65 {
68 m_scene = scene; 66 m_scene = scene;
69 m_transactionManager = new AgentAssetTransactionsManager(m_scene, m_dumpAssetsToFile); 67 if (config.Configs["StandAlone"] != null)
68 {
69 try
70 {
71 m_dumpAssetsToFile = config.Configs["StandAlone"].GetBoolean("dump_assets_to_file", false);
72 m_transactionManager = new AgentAssetTransactionsManager(m_scene, m_dumpAssetsToFile);
73 }
74 catch (Exception)
75 {
76 m_transactionManager = new AgentAssetTransactionsManager(m_scene, false);
77 }
78 }
79 else
80 {
81 m_transactionManager = new AgentAssetTransactionsManager(m_scene, false);
82 }
83
70 } 84 }
71 } 85 }
72 86