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

1 files changed, 6 insertions, 2 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 2a7e4c3..b9fd163 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -701,7 +701,7 @@
     MaxOutgoingTransferVersion = "SIMULATION/0.3"
 
     ; The maximum distance in regions that an agent is allowed to teleport 
-    ; along the x or y axis. This is set to 16383 because current viewers 
+    ; along the x or y axis. This is set to 65535 because current viewers 
     ; can't handle teleports that are greater than this distance
     ; Setting to 0 will allow teleports of any distance
     ;
@@ -1755,8 +1755,12 @@
 
 
 [Terrain]
+    ; Values can be "pinhead-island" or "flat"
     InitialTerrain = "pinhead-island"
-
+    ; If 'true' each avatar is only sent terrain patches within their view distance
+    ; This also changes the region terrain loading from 'lawn mower' to ordered around
+    ;     the avatar outward.
+    SendTerrainUpdatesByViewDistance = False
 
 ;; 
 ;; If you are using a simian grid frontend you can enable