diff options
| author | Mark Palange <palange@lindenlab.com> | 2008-10-07 22:49:00 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2008-10-07 22:49:00 +0000 |
| commit | 4296542cd062af425d7744c88d6dd2bd00daf532 (patch) | |
| tree | 8926d4f0bfaa9ed672f4cf90577afcf8e7f44a97 /indra/newview/llviewerjoystick.h | |
| parent | c9be97fdfcc6a4c6b23a8c90916af54a38d60ab0 (diff) | |
Roll back of r98854 Accidentally commited merge in progress
Diffstat (limited to 'indra/newview/llviewerjoystick.h')
| -rw-r--r-- | indra/newview/llviewerjoystick.h | 2 |
1 files changed, 1 insertions, 1 deletions
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); |