Second Life viewer sources 1.23.0-RC

1 files changed, 15 insertions, 1 deletions

diff --git a/linden/indra/newview/llfloaterjoystick.h b/linden/indra/newview/llfloaterjoystick.h
index 8d729a2..3ce647e 100644
--- a/linden/indra/newview/llfloaterjoystick.h
+++ b/linden/indra/newview/llfloaterjoystick.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -35,6 +36,8 @@
 #include "llfloater.h"
 #include "llstatview.h"
 
+class LLCheckBoxCtrl;
+
 class LLFloaterJoystick : public LLFloater, public LLFloaterSingleton<LLFloaterJoystick >
 {
 public:
@@ -49,16 +52,23 @@ public:
         static  void setSNDefaults();
 
 private:
+        static void onCommitJoystickEnabled(LLUICtrl*, void*);
         static void onClickRestoreSNDefaults(void*);
+        static void onClickCancel(void*);
+        static void onClickOK(void*);
 
 private:
         // Device prefs
+        bool mJoystickEnabled;
         S32 mJoystickAxis[7];
         bool m3DCursor;
         bool mAutoLeveling;
         bool mZoomDirect;
 
         // Modes prefs
+        bool mAvatarEnabled;
+        bool mBuildEnabled;
+        bool mFlycamEnabled;
         F32 mAvatarAxisScale[6];
         F32 mBuildAxisScale[6];
         F32 mFlycamAxisScale[7];
@@ -69,6 +79,10 @@ private:
         F32 mBuildFeathering;
         F32 mFlycamFeathering;
 
+        // Controls that can disable the flycam
+        LLCheckBoxCtrl  *mCheckJoystickEnabled;
+        LLCheckBoxCtrl  *mCheckFlycamEnabled;
+
         // stats view 
         LLStatView*             mAxisStatsView;
         LLStat*                 mAxisStats[6];