diff options
author | Justin Clark-Casey (justincc) | 2014-11-20 21:28:12 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-11-25 23:23:11 +0000 |
commit | 124be38f745b884fac5dbdb6ef963387235f6108 (patch) | |
tree | be6cb021609e02330fb4477fd819522481066ae4 /bin | |
parent | Fix compile error from previous 1d56029848e96016b5809f596619e32d0ebcc995 (diff) | |
download | opensim-SC_OLD-124be38f745b884fac5dbdb6ef963387235f6108.zip opensim-SC_OLD-124be38f745b884fac5dbdb6ef963387235f6108.tar.gz opensim-SC_OLD-124be38f745b884fac5dbdb6ef963387235f6108.tar.bz2 opensim-SC_OLD-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 '')
-rw-r--r-- | bin/OpenSim.ini.example | 5 | ||||
-rw-r--r-- | bin/OpenSimDefaults.ini | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 573180a..0374877 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -619,6 +619,11 @@ | |||
619 | ; ForwardOfflineGroupMessages = true | 619 | ; ForwardOfflineGroupMessages = true |
620 | 620 | ||
621 | 621 | ||
622 | [BulletSim] | ||
623 | ;# {AvatarToAvatarCollisionsByDefault} {[Startup]physics:BulletSim} {Should avatars collide with each other?} {true false} true | ||
624 | AvatarToAvatarCollisionsByDefault = true | ||
625 | |||
626 | |||
622 | [ODEPhysicsSettings] | 627 | [ODEPhysicsSettings] |
623 | ;# {mesh_sculpted_prim} {[Startup]physics:OpenDynamicsEngine} {Mesh sculpties so they collide as they look?} {true false} true | 628 | ;# {mesh_sculpted_prim} {[Startup]physics:OpenDynamicsEngine} {Mesh sculpties so they collide as they look?} {true false} true |
624 | ;; Do we want to mesh sculpted prim to collide like they look? | 629 | ;; Do we want to mesh sculpted prim to collide like they look? |
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 |