Merge branch 'master' of opensimulator.org:/var/git/opensim

2 files changed, 14 insertions, 8 deletions

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 84e029b..f09d2a1 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -161,13 +161,19 @@
     ; Warning!  Don't use this with regions that have existing content!, This will likely break them
     CombineContiguousRegions = false
 
-    ; Extend the region's draw distance; 255m is the default which includes
-    ; one neighbor on each side of the current region, 767m would go three
-    ; neighbors on each side for a total of 49 regions in view. Warning, unless
-    ; all the regions have the same drawdistance, you will end up with strange
-    ; effects because the agents that get closed may be inconsistent.
+    ; the default view range. Viewers override this ( no major effect still )
     DefaultDrawDistance = 255.0
 
+        ; limit the maximum view range ( no effect still (does limit MaxRegionsViewDistance) )
+        MaxDrawDistance = 512
+        
+        ; the maximum distance to tell a viewer to connect to a neighbour region, so it can be seen
+        ; (it is limited by MaxDrawDistance above)
+        ; less than 256 shows imediate neighbours; 512 also second imediate neighbours etc
+        ; more than 512m can cause viewers problems specially in case of dense regions.
+        ; curretly this distance is from current region borders.
+        MaxRegionsViewDistance = 255
+        
     ; If you have only one region in an instance, or to avoid the many bugs
     ; that you can trigger in modules by restarting a region, set this to
     ; true to make the entire instance exit instead of restarting the region.
@@ -412,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