aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/UserConfig.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-12-29 16:56:48 +0000
committerJustin Clarke Casey2008-12-29 16:56:48 +0000
commit266d0fbaaeac0dad06da98ceda8d19b8f3d732d6 (patch)
tree45f2ad93db485b5144c3fc86662891432c3a877a /OpenSim/Framework/UserConfig.cs
parentRevamp the return logic to close a privilege escalation loophole. (diff)
downloadopensim-SC_OLD-266d0fbaaeac0dad06da98ceda8d19b8f3d732d6.zip
opensim-SC_OLD-266d0fbaaeac0dad06da98ceda8d19b8f3d732d6.tar.gz
opensim-SC_OLD-266d0fbaaeac0dad06da98ceda8d19b8f3d732d6.tar.bz2
opensim-SC_OLD-266d0fbaaeac0dad06da98ceda8d19b8f3d732d6.tar.xz
* 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
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/UserConfig.cs11
1 files changed, 10 insertions, 1 deletions
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
47 public uint HttpPort = DefaultHttpPort; 47 public uint HttpPort = DefaultHttpPort;
48 public bool HttpSSL = DefaultHttpSSL; 48 public bool HttpSSL = DefaultHttpSSL;
49 public uint DefaultUserLevel = 0; 49 public uint DefaultUserLevel = 0;
50 public string LibraryXmlfile = "";
50 51
51 private Uri m_inventoryUrl; 52 private Uri m_inventoryUrl;
52 53
@@ -109,6 +110,11 @@ namespace OpenSim.Framework
109 "Default Inventory Server URI", 110 "Default Inventory Server URI",
110 "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort + "/", 111 "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort + "/",
111 false); 112 false);
113 configMember.addConfigurationOption("library_location",
114 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
115 "Path to library control file",
116 string.Format(".{0}inventory{0}Libraries.xml", System.IO.Path.DirectorySeparatorChar), false);
117
112 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 118 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
113 "DLL for database provider", "OpenSim.Data.MySQL.dll", false); 119 "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
114 configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 120 configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
@@ -173,7 +179,10 @@ namespace OpenSim.Framework
173 179
174 case "default_loginLevel": 180 case "default_loginLevel":
175 DefaultUserLevel = (uint)configuration_result; 181 DefaultUserLevel = (uint)configuration_result;
176 break; 182 break;
183 case "library_location":
184 LibraryXmlfile = (string)configuration_result;
185 break;
177 } 186 }
178 187
179 return true; 188 return true;