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/Framework/Communications/Cache/AssetServerBase.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Framework/Communications/Cache/AssetServerBase.cs')

diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
index a289fb7..137bde9 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
@@ -106,11 +106,11 @@ namespace OpenSim.Framework.Communications.Cache
             }
         }
 
-        public virtual void LoadDefaultAssets()
+        public virtual void LoadDefaultAssets(string pAssetSetsXml)
         {
             m_log.Info("[ASSET SERVER]: Setting up asset database");
 
-            assetLoader.ForEachDefaultXmlAsset(StoreAsset);
+            assetLoader.ForEachDefaultXmlAsset(pAssetSetsXml, StoreAsset);
         }
 
         public AssetServerBase()
-- 
cgit v1.1