diff options
Diffstat (limited to 'linden/indra/newview/llvoiceremotectrl.h')
-rw-r--r-- | linden/indra/newview/llvoiceremotectrl.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/linden/indra/newview/llvoiceremotectrl.h b/linden/indra/newview/llvoiceremotectrl.h index 8c88fb6..17f55fb 100644 --- a/linden/indra/newview/llvoiceremotectrl.h +++ b/linden/indra/newview/llvoiceremotectrl.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,6 +42,7 @@ public: | |||
42 | LLVoiceRemoteCtrl (const LLString& name); | 42 | LLVoiceRemoteCtrl (const LLString& name); |
43 | virtual ~LLVoiceRemoteCtrl(); | 43 | virtual ~LLVoiceRemoteCtrl(); |
44 | 44 | ||
45 | /*virtual*/ BOOL postBuild(); | ||
45 | /*virtual*/ void draw(); | 46 | /*virtual*/ void draw(); |
46 | 47 | ||
47 | static void onBtnLock(void* user_data); | 48 | static void onBtnLock(void* user_data); |
@@ -49,6 +50,9 @@ public: | |||
49 | static void onBtnTalkReleased(void* user_data); | 50 | static void onBtnTalkReleased(void* user_data); |
50 | static void onBtnTalkClicked(void* user_data); | 51 | static void onBtnTalkClicked(void* user_data); |
51 | static void onClickSpeakers(void *user_data); | 52 | static void onClickSpeakers(void *user_data); |
53 | static void onClickPopupBtn(void* user_data); | ||
54 | static void onClickVoiceChannel(void* user_data); | ||
55 | static void onClickEndCall(void* user_data); | ||
52 | 56 | ||
53 | protected: | 57 | protected: |
54 | LLButton* mTalkBtn; | 58 | LLButton* mTalkBtn; |