diff options
author | Palmer <palmer@lindenlab.com> | 2009-08-06 14:51:11 -0700 |
---|---|---|
committer | Palmer <palmer@lindenlab.com> | 2009-08-06 14:51:11 -0700 |
commit | b2632c50efc12eacdcadace64e6c0f1906b86ff6 (patch) | |
tree | c32d7e9b29e37d5c30ac16dfac55733456d7eee0 /indra/newview/llfloatersettingsdebug.h | |
parent | 27cf39cdbf27fe52dcf9c70cfdadcc18ddf2e75c (diff) | |
parent | a8d216e194327c7bee8a42c983f7f2ca01adb385 (diff) |
Merge of my DEV-36732 work and all the main line login api work that went on.
Diffstat (limited to 'indra/newview/llfloatersettingsdebug.h')
-rw-r--r-- | indra/newview/llfloatersettingsdebug.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/indra/newview/llfloatersettingsdebug.h b/indra/newview/llfloatersettingsdebug.h index 87833793af..e7dda3a5f4 100644 --- a/indra/newview/llfloatersettingsdebug.h +++ b/indra/newview/llfloatersettingsdebug.h @@ -38,14 +38,11 @@ #include "lltexteditor.h" class LLFloaterSettingsDebug -: public LLFloater, - public LLFloaterSingleton<LLFloaterSettingsDebug> +: public LLFloater { + friend class LLFloaterReg; + public: - // key - selects which settings to show, one of: - // "all", "base", "account", "skin" - LLFloaterSettingsDebug(const LLSD& key); - virtual ~LLFloaterSettingsDebug(); virtual BOOL postBuild(); virtual void draw(); @@ -56,6 +53,12 @@ public: void onCommitSettings(); void onClickDefault(); +private: + // key - selects which settings to show, one of: + // "all", "base", "account", "skin" + LLFloaterSettingsDebug(const LLSD& key); + virtual ~LLFloaterSettingsDebug(); + protected: LLTextEditor* mComment; }; |