Merge branch 'master' into httptests

1 files changed, 10 insertions, 0 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 0203300..616061d 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -487,6 +487,16 @@
     ; you really do not want this...
     ;parcel_owner_is_god = false
 
+    ; God mode should be turned on in the viewer whenever
+    ; the user has god rights somewhere. They may choose
+    ; to turn it off again, though.
+    automatic_gods = false
+
+    ; The user can execute any and all god functions, as
+    ; permitted by the viewer UI, without actually "godding
+    ; up". This is the default state in 0.8.2.
+    implicit_gods = true
+
     ; Control user types that are allowed to create new scripts
     ; Only enforced if serviceside_object_permissions is true
     ;