From 266d0fbaaeac0dad06da98ceda8d19b8f3d732d6 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Mon, 29 Dec 2008 16:56:48 +0000
Subject: * 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

---
 OpenSim/Region/Application/OpenSimBase.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Application/OpenSimBase.cs')

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;
             }
 
-- 
cgit v1.1