aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/ConfigurationLoader.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Application/ConfigurationLoader.cs')
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs16
1 files changed, 1 insertions, 15 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index fea3e94..467b099 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -219,7 +219,6 @@ namespace OpenSim
219 config.Set("startup_console_commands_file", String.Empty); 219 config.Set("startup_console_commands_file", String.Empty);
220 config.Set("shutdown_console_commands_file", String.Empty); 220 config.Set("shutdown_console_commands_file", String.Empty);
221 config.Set("DefaultScriptEngine", "XEngine"); 221 config.Set("DefaultScriptEngine", "XEngine");
222 config.Set("asset_database", "default");
223 config.Set("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll"); 222 config.Set("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");
224 // life doesn't really work without this 223 // life doesn't really work without this
225 config.Set("EventQueue", true); 224 config.Set("EventQueue", true);
@@ -237,11 +236,7 @@ namespace OpenSim
237 config.Set("inventory_source", ""); 236 config.Set("inventory_source", "");
238 config.Set("userDatabase_plugin", "OpenSim.Data.SQLite.dll"); 237 config.Set("userDatabase_plugin", "OpenSim.Data.SQLite.dll");
239 config.Set("user_source", ""); 238 config.Set("user_source", "");
240 config.Set("asset_plugin", "OpenSim.Data.SQLite.dll");
241 config.Set("asset_source", "URI=file:Asset.db,version=3");
242 config.Set("LibrariesXMLFile", string.Format(".{0}inventory{0}Libraries.xml", Path.DirectorySeparatorChar)); 239 config.Set("LibrariesXMLFile", string.Format(".{0}inventory{0}Libraries.xml", Path.DirectorySeparatorChar));
243 config.Set("AssetSetsXMLFile", string.Format(".{0}assets{0}AssetSets.xml", Path.DirectorySeparatorChar));
244 config.Set("dump_assets_to_file", false);
245 } 240 }
246 241
247 { 242 {
@@ -292,10 +287,6 @@ namespace OpenSim
292 = startupConfig.GetString("storage_connection_string"); 287 = startupConfig.GetString("storage_connection_string");
293 m_configSettings.EstateConnectionString 288 m_configSettings.EstateConnectionString
294 = startupConfig.GetString("estate_connection_string", m_configSettings.StorageConnectionString); 289 = startupConfig.GetString("estate_connection_string", m_configSettings.StorageConnectionString);
295 m_configSettings.AssetStorage
296 = startupConfig.GetString("asset_database");
297 m_configSettings.AssetCache
298 = startupConfig.GetString("AssetCache", "OpenSim.Framework.Communications.Cache.AssetCache");
299 m_configSettings.ClientstackDll 290 m_configSettings.ClientstackDll
300 = startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll"); 291 = startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");
301 } 292 }
@@ -310,16 +301,11 @@ namespace OpenSim
310 m_configSettings.StandaloneInventorySource = standaloneConfig.GetString("inventory_source"); 301 m_configSettings.StandaloneInventorySource = standaloneConfig.GetString("inventory_source");
311 m_configSettings.StandaloneUserPlugin = standaloneConfig.GetString("userDatabase_plugin"); 302 m_configSettings.StandaloneUserPlugin = standaloneConfig.GetString("userDatabase_plugin");
312 m_configSettings.StandaloneUserSource = standaloneConfig.GetString("user_source"); 303 m_configSettings.StandaloneUserSource = standaloneConfig.GetString("user_source");
313 m_configSettings.StandaloneAssetPlugin = standaloneConfig.GetString("asset_plugin");
314 m_configSettings.StandaloneAssetSource = standaloneConfig.GetString("asset_source");
315 304
316 m_configSettings.LibrariesXMLFile = standaloneConfig.GetString("LibrariesXMLFile"); 305 m_configSettings.LibrariesXMLFile = standaloneConfig.GetString("LibrariesXMLFile");
317 m_configSettings.AssetSetsXMLFile = standaloneConfig.GetString("AssetSetsXMLFile");
318
319 m_configSettings.DumpAssetsToFile = standaloneConfig.GetBoolean("dump_assets_to_file", false);
320 } 306 }
321 307
322 m_networkServersInfo.loadFromConfiguration(m_config.Source); 308 m_networkServersInfo.loadFromConfiguration(m_config.Source);
323 } 309 }
324 } 310 }
325} \ No newline at end of file 311}