From 6206d9e8db427ff8f7f825f812b52f8d10bba423 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 21 Aug 2013 17:41:26 -0700
Subject: [PATCH] fix for collisions when wearing Oculus

---
 interface/src/avatar/MyAvatar.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 4ab5caf882..00898da333 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -172,7 +172,7 @@ void MyAvatar::simulate(float deltaTime, Transmitter* transmitter, float gyroCam
     if (_isCollisionsOn) {
         Camera* myCamera = Application::getInstance()->getCamera();
 
-        if (myCamera->getMode() == CAMERA_MODE_FIRST_PERSON) {
+        if (myCamera->getMode() == CAMERA_MODE_FIRST_PERSON && !OculusManager::isConnected()) {
             _collisionRadius = myCamera->getAspectRatio() * (myCamera->getNearClip() / cos(myCamera->getFieldOfView() / 2.f));
             _collisionRadius *= COLLISION_RADIUS_SCALAR;
         } else {