aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewerjoystick.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-10-17 19:06:47 -0500
committerJacek Antonelli2008-10-17 19:07:46 -0500
commit8f50d81693ff9463ae49c36935977a2b70e6bf45 (patch)
treec9cfff9baa90394b8a3866c5696c84352f19bba6 /linden/indra/newview/llviewerjoystick.h
parentFixed bad panel_overlay XML from a sloppy merge. (diff)
parentSecond Life viewer sources 1.21.6 (diff)
downloadmeta-impy-8f50d81693ff9463ae49c36935977a2b70e6bf45.zip
meta-impy-8f50d81693ff9463ae49c36935977a2b70e6bf45.tar.gz
meta-impy-8f50d81693ff9463ae49c36935977a2b70e6bf45.tar.bz2
meta-impy-8f50d81693ff9463ae49c36935977a2b70e6bf45.tar.xz
Updated source to SL version 1.21.6.
Diffstat (limited to 'linden/indra/newview/llviewerjoystick.h')
-rw-r--r--linden/indra/newview/llviewerjoystick.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llviewerjoystick.h b/linden/indra/newview/llviewerjoystick.h
index 6a582fd..44d0dca 100644
--- a/linden/indra/newview/llviewerjoystick.h
+++ b/linden/indra/newview/llviewerjoystick.h
@@ -81,7 +81,7 @@ protected:
81 void agentFly(F32 inc); 81 void agentFly(F32 inc);
82 void agentRotate(F32 pitch_inc, F32 turn_inc); 82 void agentRotate(F32 pitch_inc, F32 turn_inc);
83 void agentJump(); 83 void agentJump();
84 void resetDeltas(S32 axis[], bool flycam_and_build = false); 84 void resetDeltas(S32 axis[]);
85#if LIB_NDOF 85#if LIB_NDOF
86 static NDOF_HotPlugResult HotPlugAddCallback(NDOF_Device *dev); 86 static NDOF_HotPlugResult HotPlugAddCallback(NDOF_Device *dev);
87 static void HotPlugRemovalCallback(NDOF_Device *dev); 87 static void HotPlugRemovalCallback(NDOF_Device *dev);