1 files changed, 8 insertions, 80 deletions

diff --git a/OpenSim/Region/Environment/ModuleLoader.cs b/OpenSim/Region/Framework/ModuleLoader.cs
index f06fa0f..d393919 100644
--- a/OpenSim/Region/Environment/ModuleLoader.cs
+++ b/OpenSim/Region/Framework/ModuleLoader.cs
@@ -31,18 +31,10 @@ using System.IO;
 using System.Reflection;
 using log4net;
 using Nini.Config;
-using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Environment.Modules.Agent.AssetTransaction;
-using OpenSim.Region.Environment.Modules.Avatar.Chat;
-using OpenSim.Region.Environment.Modules.Avatar.InstantMessage;
-using OpenSim.Region.Environment.Modules.Scripting.DynamicTexture;
-using OpenSim.Region.Environment.Modules.Scripting.LoadImageURL;
-using OpenSim.Region.Environment.Modules.Scripting.XMLRPC;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
 
-//TODO: Why do we reference InstantMessageModule here?
-
-namespace OpenSim.Region.Environment
+namespace OpenSim.Region.Framework
 {
     public class ModuleLoader
     {
@@ -81,83 +73,19 @@ namespace OpenSim.Region.Environment
             return modules;
         }
 
-        public void LoadDefaultSharedModules()
+        public void LoadDefaultSharedModule(IRegionModule module)
         {
-            DynamicTextureModule dynamicModule = new DynamicTextureModule();
-            if (m_loadedSharedModules.ContainsKey(dynamicModule.Name))
-            {
-                m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", dynamicModule.Name, "DynamicTextureModule");
-            }
-            else
-            {
-                m_loadedSharedModules.Add(dynamicModule.Name, dynamicModule);
-            }
-
-            // ChatModule chat = new ChatModule();
-            // if (m_loadedSharedModules.ContainsKey(chat.Name))
-            // {
-            //     m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", chat.Name, "ChatModule");
-            // }
-            // else
-            // {
-            //     m_loadedSharedModules.Add(chat.Name, chat);
-            // }
-
-            InstantMessageModule imMod = new InstantMessageModule();
-            if (m_loadedSharedModules.ContainsKey(imMod.Name))
+            if (m_loadedSharedModules.ContainsKey(module.Name))
             {
-                m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", imMod.Name, "InstantMessageModule");
+                m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module not added!", module.Name);
             }
             else
             {
-                m_loadedSharedModules.Add(imMod.Name, imMod);
-            }
-
-            LoadImageURLModule loadMod = new LoadImageURLModule();
-            if (m_loadedSharedModules.ContainsKey(loadMod.Name))
-            {
-                m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", loadMod.Name, "LoadImageURLModule");
-            }
-            else
-            {
-                m_loadedSharedModules.Add(loadMod.Name, loadMod);
-            }
-
-           // AvatarFactoryModule avatarFactory = new AvatarFactoryModule();
-           // if (m_loadedSharedModules.ContainsKey(avatarFactory.Name))
-           // {
-           //     m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", avatarFactory.Name, "AvarFactoryModule");
-           // }
-           // else
-           // {
-           //     m_loadedSharedModules.Add(avatarFactory.Name, avatarFactory);
-           // }
-
-            XMLRPCModule xmlRpcMod = new XMLRPCModule();
-            if (m_loadedSharedModules.ContainsKey(xmlRpcMod.Name))
-            {
-                m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", xmlRpcMod.Name, "XMLRPCModule");
-            }
-            else
-            {
-                m_loadedSharedModules.Add(xmlRpcMod.Name, xmlRpcMod);
-            }
-            //TextureDownloadModule textureModule = new TextureDownloadModule();
-
-            //LoadedSharedModules.Add(textureModule.Name, textureModule);
-
-            AssetTransactionModule transactionsModule = new AssetTransactionModule();
-            if (m_loadedSharedModules.ContainsKey(transactionsModule.Name))
-            {
-                m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", transactionsModule.Name, "TransactionModule");
-            }
-            else
-            {
-                m_loadedSharedModules.Add(transactionsModule.Name, transactionsModule);
+                m_loadedSharedModules.Add(module.Name, module);
             }
-
         }
 
+
         public void InitialiseSharedModules(Scene scene)
         {
             foreach (IRegionModule module in m_loadedSharedModules.Values)