diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llpanelaudiovolume.h | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/linden/indra/newview/llpanelaudiovolume.h b/linden/indra/newview/llpanelaudiovolume.h index 48c859f..d7ddb1f 100644 --- a/linden/indra/newview/llpanelaudiovolume.h +++ b/linden/indra/newview/llpanelaudiovolume.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, |
@@ -35,24 +35,18 @@ | |||
35 | #include "llpanel.h" | 35 | #include "llpanel.h" |
36 | #include "llfloater.h" | 36 | #include "llfloater.h" |
37 | 37 | ||
38 | class LLFloaterAudioVolume : | ||
39 | public LLUISingleton<LLFloaterAudioVolume>, | ||
40 | public LLFloater | ||
41 | { | ||
42 | friend class LLUISingleton<LLFloaterAudioVolume>; | ||
43 | public: | ||
44 | LLFloaterAudioVolume(const LLSD& seed); | ||
45 | static void* createVolumePanel(void* data); | ||
46 | }; | ||
47 | 38 | ||
48 | class LLPanelAudioVolume : public LLPanel | 39 | class LLPanelAudioVolume : public LLPanel |
49 | { | 40 | { |
50 | public: | 41 | public: |
51 | LLPanelAudioVolume(); | 42 | LLPanelAudioVolume(); |
52 | virtual ~LLPanelAudioVolume(); | 43 | virtual ~LLPanelAudioVolume(); |
53 | 44 | ||
54 | virtual BOOL postBuild(); | 45 | virtual BOOL postBuild(); |
55 | virtual void draw(); | 46 | virtual void draw(); |
47 | |||
48 | private: | ||
49 | static void onCommitVolumeChange(LLUICtrl* ctrl, void* user_data); | ||
56 | }; | 50 | }; |
57 | 51 | ||
58 | #endif | 52 | #endif |