aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpanelaudiovolume.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:11 -0500
committerJacek Antonelli2008-08-15 23:45:11 -0500
commit215f423cbe18fe9ca14a26caef918d303bad28ff (patch)
tree0743442b286216cc8e19aa487c26f4e9345ffd64 /linden/indra/newview/llpanelaudiovolume.cpp
parentSecond Life viewer sources 1.18.3.5-RC (diff)
downloadmeta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.zip
meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.gz
meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.bz2
meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.xz
Second Life viewer sources 1.18.4.0-RC
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llpanelaudiovolume.cpp17
1 files changed, 6 insertions, 11 deletions
diff --git a/linden/indra/newview/llpanelaudiovolume.cpp b/linden/indra/newview/llpanelaudiovolume.cpp
index 902614e..56f03da 100644
--- a/linden/indra/newview/llpanelaudiovolume.cpp
+++ b/linden/indra/newview/llpanelaudiovolume.cpp
@@ -2,6 +2,8 @@
2 * @file llpanelaudiovolume.cpp 2 * @file llpanelaudiovolume.cpp
3 * @brief A remote control for media (video and music) 3 * @brief A remote control for media (video and music)
4 * 4 *
5 * $LicenseInfo:firstyear=2005&license=viewergpl$
6 *
5 * Copyright (c) 2005-2007, Linden Research, Inc. 7 * Copyright (c) 2005-2007, Linden Research, Inc.
6 * 8 *
7 * Second Life Viewer Source Code 9 * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
24 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO 26 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
25 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, 27 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
26 * COMPLETENESS OR PERFORMANCE. 28 * COMPLETENESS OR PERFORMANCE.
29 * $/LicenseInfo$
27 */ 30 */
28 31
29#include "llviewerprecompiledheaders.h" 32#include "llviewerprecompiledheaders.h"
@@ -72,14 +75,6 @@ LLPanelAudioVolume::LLPanelAudioVolume()
72 75
73BOOL LLPanelAudioVolume::postBuild() 76BOOL LLPanelAudioVolume::postBuild()
74{ 77{
75 childSetAction("media_play",LLOverlayBar::mediaPlay,this);
76 childSetAction("media_stop",LLOverlayBar::mediaStop,this);
77 childSetAction("media_pause",LLOverlayBar::mediaPause,this);
78
79 childSetAction("music_play",LLOverlayBar::musicPlay,this);
80 childSetAction("music_stop",LLOverlayBar::musicStop,this);
81 childSetAction("music_pause",LLOverlayBar::musicPause,this);
82
83 return TRUE; 78 return TRUE;
84} 79}
85 80
@@ -92,8 +87,8 @@ LLPanelAudioVolume::~LLPanelAudioVolume ()
92// 87//
93void LLPanelAudioVolume::draw() 88void LLPanelAudioVolume::draw()
94{ 89{
95 LLOverlayBar::enableMusicButtons(this); 90// LLOverlayBar::enableMusicButtons(this);
96 LLOverlayBar::enableMediaButtons(this); 91// LLOverlayBar::enableMediaButtons(this);
97 BOOL mute = gSavedSettings.getBOOL("MuteAudio"); 92 BOOL mute = gSavedSettings.getBOOL("MuteAudio");
98 bool enable = mute ? false : true; 93 bool enable = mute ? false : true;
99 childSetEnabled("System Volume", enable); 94 childSetEnabled("System Volume", enable);
@@ -103,7 +98,7 @@ void LLPanelAudioVolume::draw()
103 childSetEnabled("SFX Volume", enable); 98 childSetEnabled("SFX Volume", enable);
104 childSetEnabled("UI Volume", enable); 99 childSetEnabled("UI Volume", enable);
105 childSetEnabled("Wind Volume", enable); 100 childSetEnabled("Wind Volume", enable);
106 childSetEnabled("Footsteps Volume", enable);
107 LLPanel::draw(); 101 LLPanel::draw();
108} 102}
109 103
104