* Refactored out function to load specified AssetSet Xml

This commit dedicated to 'Mohawk - Bad Girls (Need Love Too)'

4 files changed, 18 insertions, 12 deletions

diff --git a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
index 46e6ae1..d6ce0c5 100644
--- a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
+++ b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
@@ -79,18 +79,23 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
             //info.loaded=true;
         }
         
-        public void ForEachXmlAsset(Action<AssetBase> action)
+        public void ForEachDefaultXmlAsset(Action<AssetBase> action)
         {
-            List<AssetBase> assets = new List<AssetBase>();            
-            string assetSetsPath = Path.Combine(Util.assetsDir(), "AssetSets.xml");
-            
-            if (File.Exists(assetSetsPath))
+            string assetSetFilename = Path.Combine(Util.assetsDir(), "AssetSets.xml");
+
+            ForEachDefaultXmlAsset(assetSetFilename, action);
+        }
+
+        public void ForEachDefaultXmlAsset(string assetSetFilename, Action<AssetBase> action)
+        {
+            List<AssetBase> assets = new List<AssetBase>();
+            if (File.Exists(assetSetFilename))
             {
                 string assetSetPath = "ERROR";
                 
                 try
                 {
-                    XmlConfigSource source = new XmlConfigSource(assetSetsPath);
+                    XmlConfigSource source = new XmlConfigSource(assetSetFilename);
                     
                     for (int i = 0; i < source.Configs.Count; i++)
                     {
@@ -111,9 +116,9 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
                     "Asset set control file assets/AssetSets.xml does not exist!  No assets loaded.");
             }
                                         
-            assets.ForEach(action);                
+            assets.ForEach(action);
         }
-        
+
         /// <summary>
         /// Use the asset set information at path to load assets
         /// </summary>
diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
index 2153fbf..318082b 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
@@ -82,11 +82,11 @@ namespace OpenSim.Framework.Communications.Cache
             }
         }
 
-        public void LoadDefaultAssets()
+        public virtual void LoadDefaultAssets()
         {
             MainLog.Instance.Verbose("ASSETSERVER", "Setting up asset database");
 
-            assetLoader.ForEachXmlAsset(StoreAsset);
+            assetLoader.ForEachDefaultXmlAsset(StoreAsset);
 
             CommitAssets();
         }
diff --git a/OpenSim/Framework/IAssetLoader.cs b/OpenSim/Framework/IAssetLoader.cs
index 6bcaa24..df0b81b 100644
--- a/OpenSim/Framework/IAssetLoader.cs
+++ b/OpenSim/Framework/IAssetLoader.cs
@@ -32,6 +32,7 @@ namespace OpenSim.Framework
 {        
     public interface IAssetLoader
     {
-        void ForEachXmlAsset(Action<AssetBase> action);        
+        void ForEachDefaultXmlAsset(Action<AssetBase> action);
+        void ForEachDefaultXmlAsset(string assetSetFilename, Action<AssetBase> action);
     }
 }
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 01b2c02..ed77e3e 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -159,7 +159,7 @@ namespace OpenSim.Grid.AssetServer
 
         public void LoadDefaultAssets()
         {
-            assetLoader.ForEachXmlAsset(StoreAsset);            
+            assetLoader.ForEachDefaultXmlAsset(StoreAsset);            
         }
 
         protected void StoreAsset(AssetBase asset)