diff options
| author | Melanie Thielker | 2016-12-20 17:08:15 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2016-12-20 17:08:15 +0000 |
| commit | 66c18438f21737d2ea6dc3af726bc8950506e2e8 (patch) | |
| tree | 9f836d199a9ccb7a03d4373fc12143d30d1c3beb /OpenSim | |
| parent | Remove obsolete "gridmode" config default in code. (diff) | |
| download | opensim-SC_OLD-66c18438f21737d2ea6dc3af726bc8950506e2e8.zip opensim-SC_OLD-66c18438f21737d2ea6dc3af726bc8950506e2e8.tar.gz opensim-SC_OLD-66c18438f21737d2ea6dc3af726bc8950506e2e8.tar.bz2 opensim-SC_OLD-66c18438f21737d2ea6dc3af726bc8950506e2e8.tar.xz | |
remove obsolete config option "storage_prim_inventories"
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Application/ConfigurationLoader.cs | 3 | ||||
| -rw-r--r-- | OpenSim/Tools/Configger/ConfigurationLoader.cs | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs index b19e549..522fe0e 100644 --- a/OpenSim/Region/Application/ConfigurationLoader.cs +++ b/OpenSim/Region/Application/ConfigurationLoader.cs | |||
| @@ -348,7 +348,6 @@ namespace OpenSim | |||
| 348 | config.Set("meshing", "Meshmerizer"); | 348 | config.Set("meshing", "Meshmerizer"); |
| 349 | config.Set("physical_prim", true); | 349 | config.Set("physical_prim", true); |
| 350 | config.Set("serverside_object_permissions", true); | 350 | config.Set("serverside_object_permissions", true); |
| 351 | config.Set("storage_prim_inventories", true); | ||
| 352 | config.Set("startup_console_commands_file", String.Empty); | 351 | config.Set("startup_console_commands_file", String.Empty); |
| 353 | config.Set("shutdown_console_commands_file", String.Empty); | 352 | config.Set("shutdown_console_commands_file", String.Empty); |
| 354 | config.Set("DefaultScriptEngine", "XEngine"); | 353 | config.Set("DefaultScriptEngine", "XEngine"); |
| @@ -387,4 +386,4 @@ namespace OpenSim | |||
| 387 | m_networkServersInfo.loadFromConfiguration(m_config.Source); | 386 | m_networkServersInfo.loadFromConfiguration(m_config.Source); |
| 388 | } | 387 | } |
| 389 | } | 388 | } |
| 390 | } \ No newline at end of file | 389 | } |
diff --git a/OpenSim/Tools/Configger/ConfigurationLoader.cs b/OpenSim/Tools/Configger/ConfigurationLoader.cs index 31ae923..aba7e64 100644 --- a/OpenSim/Tools/Configger/ConfigurationLoader.cs +++ b/OpenSim/Tools/Configger/ConfigurationLoader.cs | |||
| @@ -268,7 +268,6 @@ namespace OpenSim.Tools.Configger | |||
| 268 | config.Set("meshing", "Meshmerizer"); | 268 | config.Set("meshing", "Meshmerizer"); |
| 269 | config.Set("physical_prim", true); | 269 | config.Set("physical_prim", true); |
| 270 | config.Set("serverside_object_permissions", true); | 270 | config.Set("serverside_object_permissions", true); |
| 271 | config.Set("storage_prim_inventories", true); | ||
| 272 | config.Set("startup_console_commands_file", String.Empty); | 271 | config.Set("startup_console_commands_file", String.Empty); |
| 273 | config.Set("shutdown_console_commands_file", String.Empty); | 272 | config.Set("shutdown_console_commands_file", String.Empty); |
| 274 | config.Set("DefaultScriptEngine", "XEngine"); | 273 | config.Set("DefaultScriptEngine", "XEngine"); |