diff options
| author | Justin Clark-Casey (justincc) | 2011-07-01 23:06:46 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-07-01 23:06:46 +0100 |
| commit | fba961c63f2168eb560eec84b66203b1a875b952 (patch) | |
| tree | 3c8dc9999ab5b53cffa0e4f050c9376afbc0f81d /OpenSim/Region | |
| parent | If OpenSim has been built from a git tree, then include version information a... (diff) | |
| download | opensim-SC-fba961c63f2168eb560eec84b66203b1a875b952.zip opensim-SC-fba961c63f2168eb560eec84b66203b1a875b952.tar.gz opensim-SC-fba961c63f2168eb560eec84b66203b1a875b952.tar.bz2 opensim-SC-fba961c63f2168eb560eec84b66203b1a875b952.tar.xz | |
Make default serverside_object_permissions = true since this better matches user expectations.
It also matches the default setting in the OpenSim.ini.example file
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Application/ConfigurationLoader.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs index 2d81ea8..d19852b 100644 --- a/OpenSim/Region/Application/ConfigurationLoader.cs +++ b/OpenSim/Region/Application/ConfigurationLoader.cs | |||
| @@ -328,7 +328,7 @@ namespace OpenSim | |||
| 328 | config.Set("meshing", "Meshmerizer"); | 328 | config.Set("meshing", "Meshmerizer"); |
| 329 | config.Set("physical_prim", true); | 329 | config.Set("physical_prim", true); |
| 330 | config.Set("see_into_this_sim_from_neighbor", true); | 330 | config.Set("see_into_this_sim_from_neighbor", true); |
| 331 | config.Set("serverside_object_permissions", false); | 331 | config.Set("serverside_object_permissions", true); |
| 332 | config.Set("storage_plugin", "OpenSim.Data.SQLite.dll"); | 332 | config.Set("storage_plugin", "OpenSim.Data.SQLite.dll"); |
| 333 | config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3"); | 333 | config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3"); |
| 334 | config.Set("storage_prim_inventories", true); | 334 | config.Set("storage_prim_inventories", true); |
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index d7324c6..a40517c 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |||
| @@ -134,7 +134,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
| 134 | return; | 134 | return; |
| 135 | 135 | ||
| 136 | m_allowGridGods = myConfig.GetBoolean("allow_grid_gods", false); | 136 | m_allowGridGods = myConfig.GetBoolean("allow_grid_gods", false); |
| 137 | m_bypassPermissions = !myConfig.GetBoolean("serverside_object_permissions", false); | 137 | m_bypassPermissions = !myConfig.GetBoolean("serverside_object_permissions", true); |
| 138 | m_propagatePermissions = myConfig.GetBoolean("propagate_permissions", true); | 138 | m_propagatePermissions = myConfig.GetBoolean("propagate_permissions", true); |
| 139 | m_RegionOwnerIsGod = myConfig.GetBoolean("region_owner_is_god", true); | 139 | m_RegionOwnerIsGod = myConfig.GetBoolean("region_owner_is_god", true); |
| 140 | m_RegionManagerIsGod = myConfig.GetBoolean("region_manager_is_god", false); | 140 | m_RegionManagerIsGod = myConfig.GetBoolean("region_manager_is_god", false); |