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/UserConfig.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'OpenSim/Framework/UserConfig.cs') diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs index 87ba271..cc048b7 100644 --- a/OpenSim/Framework/UserConfig.cs +++ b/OpenSim/Framework/UserConfig.cs @@ -47,6 +47,7 @@ namespace OpenSim.Framework public uint HttpPort = DefaultHttpPort; public bool HttpSSL = DefaultHttpSSL; public uint DefaultUserLevel = 0; + public string LibraryXmlfile = ""; private Uri m_inventoryUrl; @@ -109,6 +110,11 @@ namespace OpenSim.Framework "Default Inventory Server URI", "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort + "/", false); + configMember.addConfigurationOption("library_location", + ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, + "Path to library control file", + string.Format(".{0}inventory{0}Libraries.xml", System.IO.Path.DirectorySeparatorChar), false); + configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Data.MySQL.dll", false); configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING, @@ -173,7 +179,10 @@ namespace OpenSim.Framework case "default_loginLevel": DefaultUserLevel = (uint)configuration_result; - break; + break; + case "library_location": + LibraryXmlfile = (string)configuration_result; + break; } return true; -- cgit v1.1