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/AssetConfig.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Framework/AssetConfig.cs')

diff --git a/OpenSim/Framework/AssetConfig.cs b/OpenSim/Framework/AssetConfig.cs
index 9ae98d7..cc0217f 100644
--- a/OpenSim/Framework/AssetConfig.cs
+++ b/OpenSim/Framework/AssetConfig.cs
@@ -40,6 +40,7 @@ namespace OpenSim.Framework
         public string DatabaseConnect = String.Empty;
         public string DatabaseProvider = String.Empty;
         public uint HttpPort = DefaultHttpPort;
+        public string AssetSetsLocation = string.Empty;
 
         public AssetConfig(string description, string filename)
         {
@@ -58,6 +59,10 @@ namespace OpenSim.Framework
 
             configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
                                                 "Http Listener port", DefaultHttpPort.ToString(), false);
+
+            configMember.addConfigurationOption("assetset_location", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
+                                        "Location of 'AssetSets.xml'",
+                                        string.Format(".{0}assets{0}AssetSets.xml", System.IO.Path.DirectorySeparatorChar), false);
         }
 
         public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
@@ -70,6 +75,9 @@ namespace OpenSim.Framework
                 case "database_connect":
                     DatabaseConnect = (string) configuration_result;
                     break;
+                case "assetset_location":
+                    AssetSetsLocation = (string) configuration_result;
+                    break;
                 case "http_port":
                     HttpPort = (uint) configuration_result;
                     break;
@@ -78,4 +86,4 @@ namespace OpenSim.Framework
             return true;
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.1