aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2016-01-30 15:42:59 +0000
committerUbitUmarov2016-01-30 15:42:59 +0000
commit170acd7d67b48416a17ed959968b1173e389058b (patch)
treeeee14372c413e0e138d0b2e9f200d254b437cbcb
parent accept mantis 7785 requests, at least until bullet can be also be used fix l... (diff)
downloadopensim-SC-170acd7d67b48416a17ed959968b1173e389058b.zip
opensim-SC-170acd7d67b48416a17ed959968b1173e389058b.tar.gz
opensim-SC-170acd7d67b48416a17ed959968b1173e389058b.tar.bz2
opensim-SC-170acd7d67b48416a17ed959968b1173e389058b.tar.xz
change parcel_owner_is_god configuration option from default from true to false, leaving only region_owner true by default
-rw-r--r--OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs2
-rw-r--r--bin/OpenSim.ini.example4
-rw-r--r--bin/OpenSimDefaults.ini2
3 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 2813acb..b1005f7 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -179,7 +179,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
179 m_RegionManagerIsGod = Util.GetConfigVarFromSections<bool>(config, "region_manager_is_god", 179 m_RegionManagerIsGod = Util.GetConfigVarFromSections<bool>(config, "region_manager_is_god",
180 new string[] { "Startup", "Permissions" }, false); 180 new string[] { "Startup", "Permissions" }, false);
181 m_ParcelOwnerIsGod = Util.GetConfigVarFromSections<bool>(config, "parcel_owner_is_god", 181 m_ParcelOwnerIsGod = Util.GetConfigVarFromSections<bool>(config, "parcel_owner_is_god",
182 new string[] { "Startup", "Permissions" }, true); 182 new string[] { "Startup", "Permissions" }, false);
183 183
184 m_SimpleBuildPermissions = Util.GetConfigVarFromSections<bool>(config, "simple_build_permissions", 184 m_SimpleBuildPermissions = Util.GetConfigVarFromSections<bool>(config, "simple_build_permissions",
185 new string[] { "Startup", "Permissions" }, false); 185 new string[] { "Startup", "Permissions" }, false);
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 8f5dcef..f8c0506 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -400,9 +400,9 @@
400 ;; Allow region managers to assume god powers in regions they manage 400 ;; Allow region managers to assume god powers in regions they manage
401 ; region_manager_is_god = false 401 ; region_manager_is_god = false
402 402
403 ;# {parcel_owner_is_god} {} {Allow parcel owner gods} {true false} true 403 ;# {parcel_owner_is_god} {} {Allow parcel owner gods} {true false} false
404 ;; Allow parcel owners to assume god powers in their parcels 404 ;; Allow parcel owners to assume god powers in their parcels
405 ; parcel_owner_is_god = true 405 ; parcel_owner_is_god = false
406 406
407 ;# {simple_build_permissions} {} {Allow building in parcel by access list (no groups)} {true false} false 407 ;# {simple_build_permissions} {} {Allow building in parcel by access list (no groups)} {true false} false
408 ;; More control over permissions 408 ;; More control over permissions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 725ce57..f09d2a1 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -418,7 +418,7 @@
418 ; please note that this still doesn't duplicate SL, and is not intended to 418 ; please note that this still doesn't duplicate SL, and is not intended to
419 ;region_owner_is_god = true 419 ;region_owner_is_god = true
420 ;region_manager_is_god = false 420 ;region_manager_is_god = false
421 ;parcel_owner_is_god = true 421 ;parcel_owner_is_god = false
422 422
423 ; Control user types that are allowed to create new scripts 423 ; Control user types that are allowed to create new scripts
424 ; Only enforced if serviceside_object_permissions is true 424 ; Only enforced if serviceside_object_permissions is true