summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterjoystick.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llfloaterjoystick.h')
-rw-r--r--indra/newview/llfloaterjoystick.h15
1 files changed, 9 insertions, 6 deletions
diff --git a/indra/newview/llfloaterjoystick.h b/indra/newview/llfloaterjoystick.h
index 3ce647e5bb..f3559c28e9 100644
--- a/indra/newview/llfloaterjoystick.h
+++ b/indra/newview/llfloaterjoystick.h
@@ -38,11 +38,11 @@
class LLCheckBoxCtrl;
-class LLFloaterJoystick : public LLFloater, public LLFloaterSingleton<LLFloaterJoystick >
+class LLFloaterJoystick : public LLFloater
{
+ friend class LLFloaterReg;
+
public:
- LLFloaterJoystick(const LLSD& data);
- virtual ~LLFloaterJoystick();
virtual BOOL postBuild();
virtual void refresh();
@@ -52,6 +52,10 @@ public:
static void setSNDefaults();
private:
+
+ LLFloaterJoystick(const LLSD& data);
+ virtual ~LLFloaterJoystick();
+
static void onCommitJoystickEnabled(LLUICtrl*, void*);
static void onClickRestoreSNDefaults(void*);
static void onClickCancel(void*);
@@ -84,9 +88,8 @@ private:
LLCheckBoxCtrl *mCheckFlycamEnabled;
// stats view
- LLStatView* mAxisStatsView;
- LLStat* mAxisStats[6];
- LLStatBar* mAxisStatsBar[6];
+ LLStat* mAxisStats[6];
+ LLStatBar* mAxisStatsBar[6];
};
#endif