* Apply http://opensimulator.org/mantis/view.php?id=2927 with some changes

* This allows configuration of the assetset and library control file paths to be other than ./inventory/Libraries.xml and ./assets/AssetSets.xml
* This is controlled via the LibrariesXMLFile and AssetSetsXMLFile configuration settings in [StandAlone] in OpenSim.ini (in standalone)
and via the user and asset config xml files for grid mode
* Thanks to SirKimba for the patch

2 files changed, 10 insertions, 7 deletions

diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index bfaf5af..12cb0ea 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -43,8 +43,7 @@ namespace OpenSim
         protected NetworkServersInfo m_networkServersInfo;
 
         public ConfigurationLoader()
-        {
-           
+        {           
         }
 
         public OpenSimConfigSource LoadConfigSettings(IConfigSource configSource, out ConfigSettings configSettings, out NetworkServersInfo networkInfo)
@@ -149,7 +148,9 @@ namespace OpenSim
                 config.Set("userDatabase_plugin", "OpenSim.Data.SQLite.dll");
                 config.Set("user_source", "");
                 config.Set("asset_plugin", "OpenSim.Data.SQLite.dll");
-                config.Set("asset_source", "");
+                config.Set("asset_source", "");                
+                config.Set("LibrariesXMLFile", string.Format(".{0}inventory{0}Libraries.xml", Path.DirectorySeparatorChar));
+                config.Set("AssetSetsXMLFile", string.Format(".{0}assets{0}AssetSets.xml", Path.DirectorySeparatorChar));
                 config.Set("dump_assets_to_file", false);
             }
 
@@ -186,7 +187,6 @@ namespace OpenSim
                 m_configSettings.Standalone = !startupConfig.GetBoolean("gridmode", false);
                 m_configSettings.PhysicsEngine = startupConfig.GetString("physics");
                 m_configSettings.MeshEngineName = startupConfig.GetString("meshing");
-
                 m_configSettings.PhysicalPrim = startupConfig.GetBoolean("physical_prim", true);
 
                 m_configSettings.See_into_region_from_neighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor", true);
@@ -218,7 +218,10 @@ namespace OpenSim
                 m_configSettings.StandaloneAssetPlugin = standaloneConfig.GetString("asset_plugin");
                 m_configSettings.StandaloneAssetSource = standaloneConfig.GetString("asset_source");
 
-                m_configSettings.DumpAssetsToFile = standaloneConfig.GetBoolean("dump_assets_to_file", false);
+                m_configSettings.LibrariesXMLFile = standaloneConfig.GetString("LibrariesXMLFile");
+                m_configSettings.AssetSetsXMLFile = standaloneConfig.GetString("AssetSetsXMLFile");
+                
+                m_configSettings.DumpAssetsToFile = standaloneConfig.GetBoolean("dump_assets_to_file", false);                                
             }
 
             m_networkServersInfo.loadFromConfiguration(m_config.Source);
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 832043d..9031a8b 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -178,7 +178,7 @@ namespace OpenSim
             
             m_stats = StatsManager.StartCollectingSimExtraStats();
             
-            LibraryRootFolder libraryRootFolder = new LibraryRootFolder();
+            LibraryRootFolder libraryRootFolder = new LibraryRootFolder(m_configSettings.LibrariesXMLFile);
 
             // StandAlone mode? is determined by !startupConfig.GetBoolean("gridmode", false)
             if (m_configSettings.Standalone)
@@ -291,7 +291,7 @@ namespace OpenSim
             else
             {
                 SQLAssetServer sqlAssetServer = new SQLAssetServer(m_configSettings.StandaloneAssetPlugin, m_configSettings.StandaloneAssetSource);
-                sqlAssetServer.LoadDefaultAssets();
+                sqlAssetServer.LoadDefaultAssets(m_configSettings.AssetSetsXMLFile);
                 assetServer = sqlAssetServer;
             }