diff options
author | Adam Frisby | 2008-04-30 21:32:14 +0000 |
---|---|---|
committer | Adam Frisby | 2008-04-30 21:32:14 +0000 |
commit | 3da6a05eaa43e1905d16b87b539c8253bad9a017 (patch) | |
tree | 95e1bf0905ee8bafaec41d17298b63de59980b98 /OpenSim/Region/Environment/ModuleLoader.cs | |
parent | * And more (diff) | |
download | opensim-SC_OLD-3da6a05eaa43e1905d16b87b539c8253bad9a017.zip opensim-SC_OLD-3da6a05eaa43e1905d16b87b539c8253bad9a017.tar.gz opensim-SC_OLD-3da6a05eaa43e1905d16b87b539c8253bad9a017.tar.bz2 opensim-SC_OLD-3da6a05eaa43e1905d16b87b539c8253bad9a017.tar.xz |
* Sometimes you know, you do something really stupid.
* This is one of those times (should fix build)
Diffstat (limited to 'OpenSim/Region/Environment/ModuleLoader.cs')
-rw-r--r-- | OpenSim/Region/Environment/ModuleLoader.cs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/ModuleLoader.cs b/OpenSim/Region/Environment/ModuleLoader.cs index 52a6fbd..b34e126 100644 --- a/OpenSim/Region/Environment/ModuleLoader.cs +++ b/OpenSim/Region/Environment/ModuleLoader.cs | |||
@@ -32,7 +32,13 @@ using System.Reflection; | |||
32 | using log4net; | 32 | using log4net; |
33 | using Nini.Config; | 33 | using Nini.Config; |
34 | using OpenSim.Region.Environment.Interfaces; | 34 | using OpenSim.Region.Environment.Interfaces; |
35 | using OpenSim.Region.Environment.Modules; | 35 | //TODO: Why do we reference InstantMessageModule here? |
36 | using OpenSim.Region.Environment.Modules.Agent.AssetTransaction; | ||
37 | using OpenSim.Region.Environment.Modules.Avatar.Chat; | ||
38 | using OpenSim.Region.Environment.Modules.Avatar.InstantMessage; | ||
39 | using OpenSim.Region.Environment.Modules.Scripting.DynamicTexture; | ||
40 | using OpenSim.Region.Environment.Modules.Scripting.LoadImageURL; | ||
41 | using OpenSim.Region.Environment.Modules.Scripting.XMLRPC; | ||
36 | using OpenSim.Region.Environment.Scenes; | 42 | using OpenSim.Region.Environment.Scenes; |
37 | 43 | ||
38 | namespace OpenSim.Region.Environment | 44 | namespace OpenSim.Region.Environment |
@@ -139,7 +145,7 @@ namespace OpenSim.Region.Environment | |||
139 | 145 | ||
140 | //LoadedSharedModules.Add(textureModule.Name, textureModule); | 146 | //LoadedSharedModules.Add(textureModule.Name, textureModule); |
141 | 147 | ||
142 | AgentAssetTransactionModule transactionsModule = new AgentAssetTransactionModule(); | 148 | AssetTransactionModule transactionsModule = new AssetTransactionModule(); |
143 | if (m_loadedSharedModules.ContainsKey(transactionsModule.Name)) | 149 | if (m_loadedSharedModules.ContainsKey(transactionsModule.Name)) |
144 | { | 150 | { |
145 | m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", transactionsModule.Name, "TransactionModule"); | 151 | m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", transactionsModule.Name, "TransactionModule"); |