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/Tools/Configger/ConfigurationLoader.cs | |
| 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 '')
| -rw-r--r-- | OpenSim/Tools/Configger/ConfigurationLoader.cs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Tools/Configger/ConfigurationLoader.cs b/OpenSim/Tools/Configger/ConfigurationLoader.cs index 72ba185..0b6ee9c 100644 --- a/OpenSim/Tools/Configger/ConfigurationLoader.cs +++ b/OpenSim/Tools/Configger/ConfigurationLoader.cs | |||
| @@ -240,8 +240,6 @@ namespace OpenSim.Tools.Configger | |||
| 240 | config.Set("meshing", "Meshmerizer"); | 240 | config.Set("meshing", "Meshmerizer"); |
| 241 | config.Set("physical_prim", true); | 241 | config.Set("physical_prim", true); |
| 242 | config.Set("serverside_object_permissions", true); | 242 | config.Set("serverside_object_permissions", true); |
| 243 | config.Set("storage_plugin", "OpenSim.Data.SQLite.dll"); | ||
| 244 | config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3"); | ||
| 245 | config.Set("storage_prim_inventories", true); | 243 | config.Set("storage_prim_inventories", true); |
| 246 | config.Set("startup_console_commands_file", String.Empty); | 244 | config.Set("startup_console_commands_file", String.Empty); |
| 247 | config.Set("shutdown_console_commands_file", String.Empty); | 245 | config.Set("shutdown_console_commands_file", String.Empty); |
| @@ -253,6 +251,5 @@ namespace OpenSim.Tools.Configger | |||
| 253 | 251 | ||
| 254 | return defaultConfig; | 252 | return defaultConfig; |
| 255 | } | 253 | } |
| 256 | |||
| 257 | } | 254 | } |
| 258 | } | 255 | } \ No newline at end of file |