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/Grid/AssetServer/Main.cs | 8 ++++----
 OpenSim/Grid/UserServer/Main.cs  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Grid')

diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 6d1028b..72300b5 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -87,8 +87,8 @@ namespace OpenSim.Grid.AssetServer
             m_log.Info("[ASSET]: Setting up asset DB");
             setupDB(config);
 
-            m_log.Info("[ASSET]: Loading default asset set..");
-            LoadDefaultAssets();
+            m_log.Info("[ASSET]: Loading default asset set from '" + config.AssetSetsLocation + "'");
+            LoadDefaultAssets(config.AssetSetsLocation);
 
             m_log.Info("[ASSET]: Starting HTTP process");
             m_httpServer = new BaseHttpServer(config.HttpPort);
@@ -142,9 +142,9 @@ namespace OpenSim.Grid.AssetServer
             }
         }
 
-        public void LoadDefaultAssets()
+        public void LoadDefaultAssets(string pAssetSetsLocation)
         {
-            assetLoader.ForEachDefaultXmlAsset(StoreAsset);
+            assetLoader.ForEachDefaultXmlAsset(pAssetSetsLocation, StoreAsset);
         }
 
         protected void StoreAsset(AssetBase asset)
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index f688e4c..3246757 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -137,7 +137,7 @@ namespace OpenSim.Grid.UserServer
         protected virtual void StartupLoginService(IInterServiceInventoryServices inventoryService)
         {
             m_loginService = new UserLoginService(
-                m_userManager, inventoryService, new LibraryRootFolder(), Cfg, Cfg.DefaultStartupMsg);
+                m_userManager, inventoryService, new LibraryRootFolder(Cfg.LibraryXmlfile), Cfg, Cfg.DefaultStartupMsg);
         }
 
         protected virtual void AddHttpHandlers()
-- 
cgit v1.1