From c5719c445ab49f8725ea21bd5bb51d4a0c106212 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Fri, 27 Nov 2009 17:34:50 +0000
Subject: [PATCH] whee, back to a floater for now. i'm going to stop worrying
about the position for a while and work on the functionality.
---
indra/newview/llstatusbar.cpp | 4 ++--
.../newview/skins/default/xui/en/panel_status_bar.xml | 11 +++++++++++
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index 89c007280e..d57564a9f0 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -516,10 +516,10 @@ static void onClickVolume(void* data)
// toggle the master volume pull-down
+#if 1
//LLFloater* vp =
LLFloaterReg::showInstance("volume_pulldown"); //tmp
-
-#if 0
+#else
//LLPanelVolumePulldown *foo=
//new LLPanelVolumePulldown();
//LLPanel* container = getRootView();//->getChild<LLPanel>("nav_bar_container");
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index 65bc48265d..9c66653e3c 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -81,6 +81,17 @@
name="volume_btn"
tool_tip="Global Volume Control"
width="16" />
+ <panel
+ class="panel_volume_pulldown"
+ follows="all"
+ height="533"
+ layout="topleft"
+ left="0"
+ name="volume_pulldown"
+ top="5"
+ visible="false"
+ width="313" />
+
<text
enabled="true"
follows="right|bottom"
--
GitLab