diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llfloatermute.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/linden/indra/newview/llfloatermute.h b/linden/indra/newview/llfloatermute.h index 8a02adc..4d2608a 100644 --- a/linden/indra/newview/llfloatermute.h +++ b/linden/indra/newview/llfloatermute.h | |||
@@ -12,12 +12,12 @@ | |||
12 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
13 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 13 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
15 | * online at http://secondlife.com/developers/opensource/gplv2 | 15 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
16 | * | 16 | * |
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlife.com/developers/opensource/flossexception | 20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
21 | * | 21 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 22 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 23 | * that you have read and understood your obligations described above, |
@@ -42,21 +42,17 @@ class LLUUID; | |||
42 | class LLScrollListCtrl; | 42 | class LLScrollListCtrl; |
43 | 43 | ||
44 | class LLFloaterMute | 44 | class LLFloaterMute |
45 | : public LLFloater | 45 | : public LLFloater, public LLUISingleton<LLFloaterMute> |
46 | { | 46 | { |
47 | public: | 47 | public: |
48 | LLFloaterMute(); | 48 | LLFloaterMute(const LLSD& seed); |
49 | ~LLFloaterMute(); | 49 | ~LLFloaterMute(); |
50 | 50 | ||
51 | void show(); | ||
52 | |||
53 | // Must have one global floater so chat history can | 51 | // Must have one global floater so chat history can |
54 | // be kept in the text editor. | 52 | // be kept in the text editor. |
55 | virtual void onClose(bool app_quitting) { setVisible(FALSE); } | 53 | virtual void onClose(bool app_quitting) { setVisible(FALSE); } |
54 | virtual BOOL postBuild(); | ||
56 | 55 | ||
57 | static void toggle(void*); | ||
58 | static BOOL visible(void*); | ||
59 | |||
60 | void refreshMuteList(); | 56 | void refreshMuteList(); |
61 | void selectMute(const LLUUID& id); | 57 | void selectMute(const LLUUID& id); |
62 | 58 | ||
@@ -69,7 +65,7 @@ private: | |||
69 | static void onSelectName(LLUICtrl* caller, void *data); | 65 | static void onSelectName(LLUICtrl* caller, void *data); |
70 | static void onPickUser(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* user_data); | 66 | static void onPickUser(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* user_data); |
71 | static void onClickMuteByName(void*); | 67 | static void onClickMuteByName(void*); |
72 | static void callbackMuteByName(S32 option, const LLString& text, void*); | 68 | static void callbackMuteByName(const LLString& text, void*); |
73 | 69 | ||
74 | private: | 70 | private: |
75 | LLScrollListCtrl* mMuteList; | 71 | LLScrollListCtrl* mMuteList; |