diff options
| author | Diva Canto | 2013-08-07 08:01:59 -0700 |
|---|---|---|
| committer | Diva Canto | 2013-08-07 08:01:59 -0700 |
| commit | 3194ffdab8d54723ad1546846c1d45472d6a8464 (patch) | |
| tree | 22ff7b24fc86a86e12bae5d2da526c36eebf344c /OpenSim/Region/Application/ConfigurationLoader.cs | |
| parent | Add "debug comms status" command to show current debug comms settings (diff) | |
| download | opensim-SC-3194ffdab8d54723ad1546846c1d45472d6a8464.zip opensim-SC-3194ffdab8d54723ad1546846c1d45472d6a8464.tar.gz opensim-SC-3194ffdab8d54723ad1546846c1d45472d6a8464.tar.bz2 opensim-SC-3194ffdab8d54723ad1546846c1d45472d6a8464.tar.xz | |
Fixed incomplete commit r/23317 -- see_into_region. Put the guard around estate bans also, and delete the obsolete config var.
Diffstat (limited to 'OpenSim/Region/Application/ConfigurationLoader.cs')
| -rw-r--r-- | OpenSim/Region/Application/ConfigurationLoader.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs index fc3999f..3e93638 100644 --- a/OpenSim/Region/Application/ConfigurationLoader.cs +++ b/OpenSim/Region/Application/ConfigurationLoader.cs | |||
| @@ -337,7 +337,6 @@ namespace OpenSim | |||
| 337 | config.Set("physics", "OpenDynamicsEngine"); | 337 | config.Set("physics", "OpenDynamicsEngine"); |
| 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("see_into_this_sim_from_neighbor", true); | ||
| 341 | config.Set("serverside_object_permissions", true); | 340 | config.Set("serverside_object_permissions", true); |
| 342 | config.Set("storage_plugin", "OpenSim.Data.SQLite.dll"); | 341 | config.Set("storage_plugin", "OpenSim.Data.SQLite.dll"); |
| 343 | config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3"); | 342 | config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3"); |