diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-30 15:24:23 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-30 15:24:23 +0000 |
| commit | ec42c50fe814e36cafc8e21da8badf272b383782 (patch) | |
| tree | a6aebde2acab7bb17b3c58ddfae6e4782f01ca43 /indra | |
| parent | 903de794d2ce610be775cf44453643f8419447ef (diff) | |
tidy-up. clicking mute button doesn't need to bring up the volume slider any more.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llstatusbar.cpp | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp index 04b96a3a01..d16a7c728b 100644 --- a/indra/newview/llstatusbar.cpp +++ b/indra/newview/llstatusbar.cpp @@ -512,21 +512,7 @@ static void onClickScriptDebug(void*) //static void LLStatusBar::onMouseEnterVolume(LLUICtrl* ctrl) { -#if 1 - //LLFloater* vp = - LLFloaterReg::showInstance("volume_pulldown"); //tmp -#else - #error do this for panel -#endif -} - -static void onClickVolume(void* data) -{ - // toggle the master mute setting - BOOL mute_audio = gSavedSettings.getBOOL("MuteAudio"); - gSavedSettings.setBOOL("MuteAudio", !mute_audio); - - // toggle the master volume pull-down + // show the master volume pull-down #if 1 //LLFloater* vp = @@ -553,6 +539,13 @@ static void onClickVolume(void* data) #endif } +static void onClickVolume(void* data) +{ + // toggle the master mute setting + BOOL mute_audio = gSavedSettings.getBOOL("MuteAudio"); + gSavedSettings.setBOOL("MuteAudio", !mute_audio); +} + // sets the static variables necessary for the date void LLStatusBar::setupDate() { |