From 558255ca3d4a5574e0d46cf07b0619598031fc85 Mon Sep 17 00:00:00 2001
From: atlante45 <clement.brisset@gmail.com>
Date: Tue, 6 Aug 2013 16:13:31 -0700
Subject: [PATCH] - Made collision On by default

---
 interface/src/Application.cpp   | 1 +
 interface/src/avatar/Avatar.cpp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 454a691fd5..359975339d 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1954,6 +1954,7 @@ void Application::initMenu() {
     optionsMenu->addAction("Webcam", &_webcam, SLOT(setEnabled(bool)))->setCheckable(true);
     optionsMenu->addAction("Toggle Skeleton Tracking", &_webcam, SLOT(setSkeletonTrackingOn(bool)))->setCheckable(true);
     (_wantCollisionsOn = optionsMenu->addAction("Turn collisions On", this, SLOT(toggleWantCollisionsOn())))->setCheckable(true);
+    _wantCollisionsOn->setChecked(true);
     optionsMenu->addAction("Cycle Webcam Send Mode", _webcam.getGrabber(), SLOT(cycleVideoSendMode()));
     optionsMenu->addAction("Go Home", this, SLOT(goHome()), Qt::CTRL | Qt::Key_G);
     
diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp
index e16ab73c93..d695cb4759 100755
--- a/interface/src/avatar/Avatar.cpp
+++ b/interface/src/avatar/Avatar.cpp
@@ -101,6 +101,7 @@ Avatar::Avatar(Node* owningNode) :
     _lastCollisionPosition(0, 0, 0),
     _speedBrakes(false),
     _isThrustOn(false),
+    _isCollisionsOn(true),
     _leadingAvatar(NULL),
     _voxels(this)
 {