hooked up sdague new sqlite asset database provider to the old asset system. So we can still use sqlite for assets while we wait for the rest of the new asset system to be wrote.

Needs more testing, so if it causes problems will have to swap back to db4o.

1 files changed, 17 insertions, 16 deletions

diff --git a/OpenSim/Region/Environment/ModuleLoader.cs b/OpenSim/Region/Environment/ModuleLoader.cs
index be3384b..ea416cb 100644
--- a/OpenSim/Region/Environment/ModuleLoader.cs
+++ b/OpenSim/Region/Environment/ModuleLoader.cs
@@ -28,27 +28,23 @@ namespace OpenSim.Region.Environment
         /// <param name="scene"></param>

         public void CreateDefaultModules(Scene scene, string exceptModules)

         {

-            XferModule xferManager = new XferModule();

-            xferManager.Initialise(scene);

-            scene.AddModule(xferManager.GetName(), xferManager);

-            LoadedModules.Add(xferManager);

+            IRegionModule module  = new XferModule();

+            InitialiseModule(module, scene);

 

-            ChatModule chatModule = new ChatModule();

-            chatModule.Initialise(scene);

-            scene.AddModule(chatModule.GetName(), chatModule);

-            LoadedModules.Add(chatModule);

-

-            AvatarProfilesModule avatarProfiles = new AvatarProfilesModule();

-            avatarProfiles.Initialise(scene);

-            scene.AddModule(avatarProfiles.GetName(), avatarProfiles);

-            LoadedModules.Add(avatarProfiles);

+            module = new ChatModule();

+            InitialiseModule(module, scene);

+            

+            module = new AvatarProfilesModule();

+            InitialiseModule(module, scene);

 

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

 

             string lslPath = System.IO.Path.Combine("ScriptEngines", "OpenSim.Region.ScriptEngine.DotNetEngine.dll");

             this.LoadRegionModule(lslPath, "LSLScriptingModule", scene);

+

         }

 

+

         public void LoadDefaultSharedModules(string exceptModules)

         {

             DynamicTextureModule dynamicModule = new DynamicTextureModule();

@@ -64,6 +60,13 @@ namespace OpenSim.Region.Environment
             }

         }

 

+        private void InitialiseModule(IRegionModule module, Scene scene)

+        {

+            module.Initialise(scene);

+            scene.AddModule(module.GetName(), module);

+            LoadedModules.Add(module);

+        }

+

         /// <summary>

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

         /// </summary>

@@ -84,9 +87,7 @@ namespace OpenSim.Region.Environment
             IRegionModule module = this.LoadModule(dllName, moduleName);

             if (module != null)

             {

-                module.Initialise(scene);

-                scene.AddModule(module.GetName(), module);

-                LoadedModules.Add(module);

+                this.InitialiseModule(module, scene);

             }

         }