From 53108b01ef852f7ccdfd4fcafac6b505393b0238 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 16 Apr 2013 12:02:33 -0700
Subject: [PATCH] resolve conflicts on merge with upstream master

---
 interface/src/main.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/interface/src/main.cpp b/interface/src/main.cpp
index efb9a70e28..90950f4060 100644
--- a/interface/src/main.cpp
+++ b/interface/src/main.cpp
@@ -354,8 +354,8 @@ void reset_sensors()
     // 
     myAvatar.setRenderYaw(startYaw);
     
-    yaw = renderYawRate = 0; 
-    pitch = renderPitch = renderPitchRate = 0;
+    renderYawRate = 0; 
+    renderPitchRate = 0;
     myAvatar.setBodyPosition(start_location);
     headMouseX = WIDTH/2;
     headMouseY = HEIGHT/2;