From 124be38f745b884fac5dbdb6ef963387235f6108 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 20 Nov 2014 21:28:12 +0000
Subject: 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.
---
 bin/OpenSimDefaults.ini | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'bin/OpenSimDefaults.ini')

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 @@
     ;   magnifications use lots of memory.
     TerrainMeshMagnification = 2
 
+    ; Should avatars collide with each other?
+    AvatarToAvatarCollisionsByDefault = true
+
     ; Avatar physics height adjustments.
     ;   http://opensimulator.org/wiki/BulletSim#Adjusting_Avatar_Height
     AvatarHeightLowFudge = 0      ; Adjustment at low end of height range
-- 
cgit v1.1