From ec42c50fe814e36cafc8e21da8badf272b383782 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Mon, 30 Nov 2009 15:24:23 +0000
Subject: [PATCH] tidy-up. clicking mute button doesn't need to bring up the
volume slider any more.
---
indra/newview/llstatusbar.cpp | 23 ++++++++---------------
1 file changed, 8 insertions(+), 15 deletions(-)
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index 04b96a3a016..d16a7c728ba 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()
{
--
GitLab