diff options
| author | Adam Moss <moss@lindenlab.com> | 2008-11-12 20:28:24 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2008-11-12 20:28:24 +0000 |
| commit | a879e13055f0bb759ee12e708184e95d8bd9be30 (patch) | |
| tree | d659c3f71dea7a4f213e9d855f331dc5af56c63a /indra/newview/llviewerjoystick.h | |
| parent | f89f19990cbb9f3f2e7473ac6c159098bdfabec7 (diff) | |
svn merge -c102054
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/morejoy-2-r102015
QAR-1016 joystick+spacenav improvements MERGE
Diffstat (limited to 'indra/newview/llviewerjoystick.h')
| -rw-r--r-- | indra/newview/llviewerjoystick.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewerjoystick.h b/indra/newview/llviewerjoystick.h index c4dd8cfc5a..fbfcef0173 100644 --- a/indra/newview/llviewerjoystick.h +++ b/indra/newview/llviewerjoystick.h @@ -76,6 +76,7 @@ public: protected: void updateEnabled(bool autoenable); void terminate(); + void handleRun(F32 inc); void agentSlide(F32 inc); void agentPush(F32 inc); void agentFly(F32 inc); @@ -96,6 +97,7 @@ private: F32 mPerfScale; bool mCameraUpdated; bool mOverrideCamera; + U32 mJoystickRun; static F32 sLastDelta[7]; static F32 sDelta[7]; |