diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
| commit | 07129bf928f79246849e66b396fab44a7a228216 (patch) | |
| tree | e4e19b342540450ff84dad75f90d5acb5b3d6269 /indra/newview/llfloaterjoystick.h | |
| parent | 03ebc43132331b9a8dcb3c418ec9c319a6beddda (diff) | |
| parent | dc62495da6e5c153c0df57fdbce6b0f40c0208f2 (diff) | |
Merge recent changes
Diffstat (limited to 'indra/newview/llfloaterjoystick.h')
| -rw-r--r-- | indra/newview/llfloaterjoystick.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/llfloaterjoystick.h b/indra/newview/llfloaterjoystick.h index 9c66b3a895..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*); |