Added a Debug method to the Console/log class that has the Conditional attribute (set to "DEBUG"), so we can use that for writing extra debug info to the console. [for anyone who doesn't know about the Conditional attribute, it is a attribute that can be set on a method, and then any call to that method will on be compiled if the terms of that condition are met, ie is this case only if "DEBUG" is true. So its a cleaner implementation of the #if #endif directives].

A few other minor changes.  

1 files changed, 21 insertions, 3 deletions

diff --git a/OpenSim/Region/Environment/ModuleLoader.cs b/OpenSim/Region/Environment/ModuleLoader.cs
index dbe43d5..1787a57 100644
--- a/OpenSim/Region/Environment/ModuleLoader.cs
+++ b/OpenSim/Region/Environment/ModuleLoader.cs
@@ -23,7 +23,7 @@ namespace OpenSim.Region.Environment
         /// Really just a test method for loading a set of currently internal modules

         /// </summary>

         /// <param name="scene"></param>

-        public void LoadInternalModules(Scene scene)

+        public void CreateDefaultModules(Scene scene)

         {

             //Testing IRegionModule ideas 

             XferModule xferManager = new XferModule();

@@ -40,12 +40,30 @@ namespace OpenSim.Region.Environment
 

             this.LoadModule("OpenSim.Region.ExtensionsScriptModule.dll", "ExtensionsScriptingModule", scene);

 

-            // Post Initialise Modules

+            // Post Initialise Modules, which most likely shouldn't be here

+            // but should rather be in a separate method that is called after all modules are loaded/created/intialised

             xferManager.PostInitialise();

-           // chatModule.PostInitialise();  //for now leave this disabled as it would start up a partially working irc bot

+            // chatModule.PostInitialise();  //for now leave this disabled as it would start up a partially working irc bot

             avatarProfiles.PostInitialise();

         }

 

+        /// <summary>

+        ///  Loads/initialises a Module instance that can be used by mutliple Regions

+        /// </summary>

+        /// <param name="dllName"></param>

+        /// <param name="moduleName"></param>

+        /// <param name="scene"></param>

+        public void LoadSharedModule(string dllName, string moduleName, Scene scene)

+        {

+

+        }

+

+        /// <summary>

+        /// Loads a external Module (if not already loaded) and creates a new instance of it for the passed Scene.

+        /// </summary>

+        /// <param name="dllName"></param>

+        /// <param name="moduleName"></param>

+        /// <param name="scene"></param>

         public void LoadModule(string dllName, string moduleName, Scene scene)

         {

             Assembly pluginAssembly = null;