From 170acd7d67b48416a17ed959968b1173e389058b Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Sat, 30 Jan 2016 15:42:59 +0000
Subject:  change parcel_owner_is_god configuration option from default from
 true to false, leaving only region_owner true by default

---
 OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 2 +-
 bin/OpenSim.ini.example                                           | 4 ++--
 bin/OpenSimDefaults.ini                                           | 2 +-
 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
             m_RegionManagerIsGod = Util.GetConfigVarFromSections<bool>(config, "region_manager_is_god",
                 new string[] { "Startup", "Permissions" }, false); 
             m_ParcelOwnerIsGod = Util.GetConfigVarFromSections<bool>(config, "parcel_owner_is_god",
-                new string[] { "Startup", "Permissions" }, true);
+                new string[] { "Startup", "Permissions" }, false);
 
             m_SimpleBuildPermissions = Util.GetConfigVarFromSections<bool>(config, "simple_build_permissions",
                 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 @@
     ;; Allow region managers to assume god powers in regions they manage
     ; region_manager_is_god = false
 
-    ;# {parcel_owner_is_god} {} {Allow parcel owner gods} {true false} true
+    ;# {parcel_owner_is_god} {} {Allow parcel owner gods} {true false} false
     ;; Allow parcel owners to assume god powers in their parcels
-    ; parcel_owner_is_god = true
+    ; parcel_owner_is_god = false
 
     ;# {simple_build_permissions} {} {Allow building in parcel by access list (no groups)} {true false} false
     ;; 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 @@
     ; please note that this still doesn't duplicate SL, and is not intended to
     ;region_owner_is_god = true
     ;region_manager_is_god = false
-    ;parcel_owner_is_god = true
+    ;parcel_owner_is_god = false
 
     ; Control user types that are allowed to create new scripts
     ; Only enforced if serviceside_object_permissions is true
-- 
cgit v1.1