aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenSimDefaults.ini
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-11-20 21:28:12 +0000
committerJustin Clark-Casey (justincc)2014-11-25 23:23:11 +0000
commit124be38f745b884fac5dbdb6ef963387235f6108 (patch)
treebe6cb021609e02330fb4477fd819522481066ae4 /bin/OpenSimDefaults.ini
parentFix compile error from previous 1d56029848e96016b5809f596619e32d0ebcc995 (diff)
downloadopensim-SC-124be38f745b884fac5dbdb6ef963387235f6108.zip
opensim-SC-124be38f745b884fac5dbdb6ef963387235f6108.tar.gz
opensim-SC-124be38f745b884fac5dbdb6ef963387235f6108.tar.bz2
opensim-SC-124be38f745b884fac5dbdb6ef963387235f6108.tar.xz
Add [BulletSim] option AvatarToAvatarCollisionsByDefault to control whether avatars collide. This is true by default.
This is implemented with a new collision type (PhantomToOthersAvatar) to potentially allow colliding and non-colliding avatars to be present in the same scene. So there is no provision yet for giving avatars different collision types. This commit replaces the temporary change in commit f3eaa6d8 where avatars would never collide when using BulletSim This is equivalent to the av_av_collisions_off option in ODE.
Diffstat (limited to 'bin/OpenSimDefaults.ini')
-rw-r--r--bin/OpenSimDefaults.ini3
1 files changed, 3 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 0be4af5..e89fa0a 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1045,6 +1045,9 @@
1045 ; magnifications use lots of memory. 1045 ; magnifications use lots of memory.
1046 TerrainMeshMagnification = 2 1046 TerrainMeshMagnification = 2
1047 1047
1048 ; Should avatars collide with each other?
1049 AvatarToAvatarCollisionsByDefault = true
1050
1048 ; Avatar physics height adjustments. 1051 ; Avatar physics height adjustments.
1049 ; http://opensimulator.org/wiki/BulletSim#Adjusting_Avatar_Height 1052 ; http://opensimulator.org/wiki/BulletSim#Adjusting_Avatar_Height
1050 AvatarHeightLowFudge = 0 ; Adjustment at low end of height range 1053 AvatarHeightLowFudge = 0 ; Adjustment at low end of height range