Merge branch 'master' into connector_plugin

1 files changed, 9 insertions, 0 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 677ac74..2fca6ce 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -844,6 +844,15 @@
     ; When the avatar flies, it will be moved up by this amount off the ground (in meters)
     minimum_ground_flight_offset = 3.0
 
+    ; Plant avatar.   This reduces the effect of physical contacts with the avatar.
+    ; If you have a group of unruly and rude visitors that bump each other, turn this on to make that less attractive.  
+    ; The avatar still allows a small movement based on the PID settings above.  Stronger PID settings AND this active 
+    ; will lock the avatar in place
+    av_planted = false
+
+    ; No Avatar Avatar Collissions.  This causes avatar to be able to walk through each other as if they're ghosts but still interact with the environment
+    av_av_collisions_off = false
+
     ; ##
     ; ## Object options
     ; ##