diff options
Diffstat (limited to 'linden/indra/newview/llmediaremotectrl.h')
-rw-r--r-- | linden/indra/newview/llmediaremotectrl.h | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/linden/indra/newview/llmediaremotectrl.h b/linden/indra/newview/llmediaremotectrl.h index f110365..2681681 100644 --- a/linden/indra/newview/llmediaremotectrl.h +++ b/linden/indra/newview/llmediaremotectrl.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, |
@@ -39,18 +39,17 @@ | |||
39 | class LLMediaRemoteCtrl : public LLPanel | 39 | class LLMediaRemoteCtrl : public LLPanel |
40 | { | 40 | { |
41 | public: | 41 | public: |
42 | LLMediaRemoteCtrl ( const LLString& name, | 42 | LLMediaRemoteCtrl (); |
43 | const LLString& label, | ||
44 | const LLRect& rect, | ||
45 | const LLString& xml_file ); | ||
46 | 43 | ||
47 | virtual ~LLMediaRemoteCtrl (); | 44 | /*virtual*/ ~LLMediaRemoteCtrl (); |
48 | virtual BOOL postBuild(); | 45 | /*virtual*/ BOOL postBuild(); |
46 | /*virtual*/ void draw(); | ||
49 | 47 | ||
50 | virtual void draw(); | 48 | static void onClickExpandBtn(void* user_data); |
51 | 49 | static void* createVolumePanel(void* data); | |
52 | virtual EWidgetType getWidgetType() const; | 50 | |
53 | virtual LLString getWidgetTag() const; | 51 | protected: |
52 | void build(); | ||
54 | }; | 53 | }; |
55 | 54 | ||
56 | #endif | 55 | #endif |