From 2288d96868339be5725161ecc5252de88a6c3925 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Tue, 12 Jan 2016 10:20:35 -0800
Subject: [PATCH] fix CharacterController ray cast for floor

---
 libraries/physics/src/CharacterController.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libraries/physics/src/CharacterController.cpp b/libraries/physics/src/CharacterController.cpp
index 0797058f05..7c2ca31f8f 100644
--- a/libraries/physics/src/CharacterController.cpp
+++ b/libraries/physics/src/CharacterController.cpp
@@ -27,6 +27,9 @@ class ClosestNotMe : public btCollisionWorld::ClosestRayResultCallback {
 public:
     ClosestNotMe(btRigidBody* me) : btCollisionWorld::ClosestRayResultCallback(btVector3(0.0f, 0.0f, 0.0f), btVector3(0.0f, 0.0f, 0.0f)) {
         _me = me;
+        // the RayResultCallback's group and mask must match MY_AVATAR
+        m_collisionFilterGroup = BULLET_COLLISION_GROUP_MY_AVATAR;
+        m_collisionFilterMask = BULLET_COLLISION_MASK_MY_AVATAR;
     }
     virtual btScalar addSingleResult(btCollisionWorld::LocalRayResult& rayResult,bool normalInWorldSpace) {
         if (rayResult.m_collisionObject == _me) {