Work in progress on SECS stuff. Have been holding it off until after 0.6 release. Still messy as hell and doesn't really work yet. Will undergo dramatic changes. AND MOST IMPORTANTLY: Will be conformed to work in coop with todays DNE and XEngine, hopefully one day providing a common interface for all components.

2 files changed, 12 insertions, 4 deletions

diff --git a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
index cf601f1..6fe9fb4 100644
--- a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
+++ b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
 
             if (!String.IsNullOrEmpty(path))
             {
-                m_log.InfoFormat("[ASSETS]: Loading: [{0}][{1}]", name, path);
+                //m_log.InfoFormat("[ASSETS]: Loading: [{0}][{1}]", name, path);
 
                 LoadAsset(asset, isImage, path);
             }
@@ -131,7 +131,7 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
         /// <param name="assets"></param>
         protected static void LoadXmlAssetSet(string assetSetPath, List<AssetBase> assets)
         {
-            m_log.InfoFormat("[ASSETS]: Loading asset set {0}", assetSetPath);
+            //m_log.InfoFormat("[ASSETS]: Loading asset set {0}", assetSetPath);
 
             if (File.Exists(assetSetPath))
             {
diff --git a/OpenSim/Framework/PluginLoader.cs b/OpenSim/Framework/PluginLoader.cs
index 497d9f5..440e0d5 100644
--- a/OpenSim/Framework/PluginLoader.cs
+++ b/OpenSim/Framework/PluginLoader.cs
@@ -171,6 +171,7 @@ namespace OpenSim.Framework
                 if (filters.ContainsKey (ext))
                     filter = filters [ext];
 
+                List<T> loadedPlugins = new List<T>();
                 foreach (PluginExtensionNode node in AddinManager.GetExtensionNodes (ext))
                 {
                     log.Info("[PLUGINS]: Trying plugin " + node.Path);
@@ -179,8 +180,15 @@ namespace OpenSim.Framework
                         continue;
 
                     T plugin = (T) node.CreateInstance();
-                    Initialiser.Initialise (plugin);
-                    Plugins.Add (plugin);
+                    loadedPlugins.Add(plugin);
+                }
+                // We do Initialise() in a second loop after CreateInstance
+                // So that modules who need init before others can do it
+                // Example: Script Engine Component System needs to load its components before RegionLoader starts
+                foreach (T plugin in loadedPlugins)
+                {
+                    Initialiser.Initialise(plugin);
+                    Plugins.Add(plugin);
                 }
             }
         }