aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/ConfigurationLoader.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/Region/Application/ConfigurationLoader.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 'OpenSim/Region/Application/ConfigurationLoader.cs')
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs13
1 files changed, 8 insertions, 5 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index bfaf5af..12cb0ea 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -43,8 +43,7 @@ namespace OpenSim
43 protected NetworkServersInfo m_networkServersInfo; 43 protected NetworkServersInfo m_networkServersInfo;
44 44
45 public ConfigurationLoader() 45 public ConfigurationLoader()
46 { 46 {
47
48 } 47 }
49 48
50 public OpenSimConfigSource LoadConfigSettings(IConfigSource configSource, out ConfigSettings configSettings, out NetworkServersInfo networkInfo) 49 public OpenSimConfigSource LoadConfigSettings(IConfigSource configSource, out ConfigSettings configSettings, out NetworkServersInfo networkInfo)
@@ -149,7 +148,9 @@ namespace OpenSim
149 config.Set("userDatabase_plugin", "OpenSim.Data.SQLite.dll"); 148 config.Set("userDatabase_plugin", "OpenSim.Data.SQLite.dll");
150 config.Set("user_source", ""); 149 config.Set("user_source", "");
151 config.Set("asset_plugin", "OpenSim.Data.SQLite.dll"); 150 config.Set("asset_plugin", "OpenSim.Data.SQLite.dll");
152 config.Set("asset_source", ""); 151 config.Set("asset_source", "");
152 config.Set("LibrariesXMLFile", string.Format(".{0}inventory{0}Libraries.xml", Path.DirectorySeparatorChar));
153 config.Set("AssetSetsXMLFile", string.Format(".{0}assets{0}AssetSets.xml", Path.DirectorySeparatorChar));
153 config.Set("dump_assets_to_file", false); 154 config.Set("dump_assets_to_file", false);
154 } 155 }
155 156
@@ -186,7 +187,6 @@ namespace OpenSim
186 m_configSettings.Standalone = !startupConfig.GetBoolean("gridmode", false); 187 m_configSettings.Standalone = !startupConfig.GetBoolean("gridmode", false);
187 m_configSettings.PhysicsEngine = startupConfig.GetString("physics"); 188 m_configSettings.PhysicsEngine = startupConfig.GetString("physics");
188 m_configSettings.MeshEngineName = startupConfig.GetString("meshing"); 189 m_configSettings.MeshEngineName = startupConfig.GetString("meshing");
189
190 m_configSettings.PhysicalPrim = startupConfig.GetBoolean("physical_prim", true); 190 m_configSettings.PhysicalPrim = startupConfig.GetBoolean("physical_prim", true);
191 191
192 m_configSettings.See_into_region_from_neighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor", true); 192 m_configSettings.See_into_region_from_neighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor", true);
@@ -218,7 +218,10 @@ namespace OpenSim
218 m_configSettings.StandaloneAssetPlugin = standaloneConfig.GetString("asset_plugin"); 218 m_configSettings.StandaloneAssetPlugin = standaloneConfig.GetString("asset_plugin");
219 m_configSettings.StandaloneAssetSource = standaloneConfig.GetString("asset_source"); 219 m_configSettings.StandaloneAssetSource = standaloneConfig.GetString("asset_source");
220 220
221 m_configSettings.DumpAssetsToFile = standaloneConfig.GetBoolean("dump_assets_to_file", false); 221 m_configSettings.LibrariesXMLFile = standaloneConfig.GetString("LibrariesXMLFile");
222 m_configSettings.AssetSetsXMLFile = standaloneConfig.GetString("AssetSetsXMLFile");
223
224 m_configSettings.DumpAssetsToFile = standaloneConfig.GetBoolean("dump_assets_to_file", false);
222 } 225 }
223 226
224 m_networkServersInfo.loadFromConfiguration(m_config.Source); 227 m_networkServersInfo.loadFromConfiguration(m_config.Source);