From 4296542cd062af425d7744c88d6dd2bd00daf532 Mon Sep 17 00:00:00 2001
From: Mark Palange <palange@lindenlab.com>
Date: Tue, 7 Oct 2008 22:49:00 +0000
Subject: Roll back of r98854 Accidentally commited merge in progress

---
 indra/newview/llviewerjoystick.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llviewerjoystick.h')

diff --git a/indra/newview/llviewerjoystick.h b/indra/newview/llviewerjoystick.h
index c4dd8cfc5a..82549cb2dd 100644
--- a/indra/newview/llviewerjoystick.h
+++ b/indra/newview/llviewerjoystick.h
@@ -81,7 +81,7 @@ protected:
 	void agentFly(F32 inc);
 	void agentRotate(F32 pitch_inc, F32 turn_inc);
     void agentJump();
-	void resetDeltas(S32 axis[]);
+	void resetDeltas(S32 axis[], bool flycam_and_build = false);
 #if LIB_NDOF
 	static NDOF_HotPlugResult HotPlugAddCallback(NDOF_Device *dev);
 	static void HotPlugRemovalCallback(NDOF_Device *dev);
-- 
cgit v1.2.3