diff options
| author | Robert Adams | 2013-11-04 22:12:57 -0800 |
|---|---|---|
| committer | Robert Adams | 2013-11-04 22:12:57 -0800 |
| commit | c931b16c1fd50d3b955662c8cd6134d7a235c519 (patch) | |
| tree | 8aeca3e6dccf6b177908f3842196f59230777109 /OpenSim/Region/Application | |
| parent | varregion: add plumbing to pass region size from Scene down to the (diff) | |
| parent | If the LSL state_entry() event definition contains any parameters, then gener... (diff) | |
| download | opensim-SC_OLD-c931b16c1fd50d3b955662c8cd6134d7a235c519.zip opensim-SC_OLD-c931b16c1fd50d3b955662c8cd6134d7a235c519.tar.gz opensim-SC_OLD-c931b16c1fd50d3b955662c8cd6134d7a235c519.tar.bz2 opensim-SC_OLD-c931b16c1fd50d3b955662c8cd6134d7a235c519.tar.xz | |
Merge branch 'master' into varregion
Diffstat (limited to 'OpenSim/Region/Application')
| -rw-r--r-- | OpenSim/Region/Application/ConfigurationLoader.cs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs index 010ae5a..e3e0c01 100644 --- a/OpenSim/Region/Application/ConfigurationLoader.cs +++ b/OpenSim/Region/Application/ConfigurationLoader.cs | |||
| @@ -338,8 +338,6 @@ namespace OpenSim | |||
| 338 | config.Set("meshing", "Meshmerizer"); | 338 | config.Set("meshing", "Meshmerizer"); |
| 339 | config.Set("physical_prim", true); | 339 | config.Set("physical_prim", true); |
| 340 | config.Set("serverside_object_permissions", true); | 340 | config.Set("serverside_object_permissions", true); |
| 341 | config.Set("storage_plugin", "OpenSim.Data.SQLite.dll"); | ||
| 342 | config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3"); | ||
| 343 | config.Set("storage_prim_inventories", true); | 341 | config.Set("storage_prim_inventories", true); |
| 344 | config.Set("startup_console_commands_file", String.Empty); | 342 | config.Set("startup_console_commands_file", String.Empty); |
| 345 | config.Set("shutdown_console_commands_file", String.Empty); | 343 | config.Set("shutdown_console_commands_file", String.Empty); |
| @@ -371,7 +369,6 @@ namespace OpenSim | |||
| 371 | { | 369 | { |
| 372 | m_configSettings.PhysicsEngine = startupConfig.GetString("physics"); | 370 | m_configSettings.PhysicsEngine = startupConfig.GetString("physics"); |
| 373 | m_configSettings.MeshEngineName = startupConfig.GetString("meshing"); | 371 | m_configSettings.MeshEngineName = startupConfig.GetString("meshing"); |
| 374 | m_configSettings.StorageDll = startupConfig.GetString("storage_plugin"); | ||
| 375 | 372 | ||
| 376 | m_configSettings.ClientstackDll | 373 | m_configSettings.ClientstackDll |
| 377 | = startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll"); | 374 | = startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll"); |