diff options
author | BlueWall | 2012-10-19 07:46:00 -0400 |
---|---|---|
committer | BlueWall | 2012-10-19 07:46:00 -0400 |
commit | 276600ab71a44987ede0bef243cd6ae82c08055d (patch) | |
tree | 344f486f78b95193353a072152836d882e87ab45 /bin | |
parent | Move PluginManager (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-276600ab71a44987ede0bef243cd6ae82c08055d.zip opensim-SC_OLD-276600ab71a44987ede0bef243cd6ae82c08055d.tar.gz opensim-SC_OLD-276600ab71a44987ede0bef243cd6ae82c08055d.tar.bz2 opensim-SC_OLD-276600ab71a44987ede0bef243cd6ae82c08055d.tar.xz |
Merge branch 'master' into connector_plugin
Diffstat (limited to 'bin')
-rw-r--r-- | bin/OpenSimDefaults.ini | 9 |
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 @@ | |||
844 | ; When the avatar flies, it will be moved up by this amount off the ground (in meters) | 844 | ; When the avatar flies, it will be moved up by this amount off the ground (in meters) |
845 | minimum_ground_flight_offset = 3.0 | 845 | minimum_ground_flight_offset = 3.0 |
846 | 846 | ||
847 | ; Plant avatar. This reduces the effect of physical contacts with the avatar. | ||
848 | ; If you have a group of unruly and rude visitors that bump each other, turn this on to make that less attractive. | ||
849 | ; The avatar still allows a small movement based on the PID settings above. Stronger PID settings AND this active | ||
850 | ; will lock the avatar in place | ||
851 | av_planted = false | ||
852 | |||
853 | ; 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 | ||
854 | av_av_collisions_off = false | ||
855 | |||
847 | ; ## | 856 | ; ## |
848 | ; ## Object options | 857 | ; ## Object options |
849 | ; ## | 858 | ; ## |