From 655f33a9f818d75dd0f8d6040dfffd0520344222 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Mon, 23 Nov 2009 17:52:37 +0000 Subject: panelized volume pulldown, that doesn't work at all. --- indra/newview/llstatusbar.cpp | 6 ++++-- .../skins/default/xui/en/panel_volume_pulldown.xml | 24 +++------------------- 2 files changed, 7 insertions(+), 23 deletions(-) diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp index bc9edec0ba..2bd8d5fa55 100644 --- a/indra/newview/llstatusbar.cpp +++ b/indra/newview/llstatusbar.cpp @@ -42,6 +42,7 @@ #include "llfloaterbuycurrency.h" #include "llfloaterchat.h" #include "llfloaterlagmeter.h" +#include "llfloatervolumepulldown.h" #include "llfloaterregioninfo.h" #include "llfloaterscriptdebug.h" #include "llhudicon.h" @@ -201,7 +202,6 @@ LLStatusBar::LLStatusBar(const LLRect& rect) addChild(mSGPacketLoss); childSetActionTextbox("stat_btn", onClickStatGraph); - } LLStatusBar::~LLStatusBar() @@ -511,7 +511,9 @@ static void onClickVolume(void* data) gSavedSettings.setBOOL("MuteAudio", !mute_audio); // toggle the master volume pull-down - LLFloaterReg::showInstance("volume_pulldown"); //tmp + //LLFloaterReg::showInstance("volume_pulldown"); //tmp + //LLPanelVolumePulldown *foo= + new LLPanelVolumePulldown(); } // sets the static variables necessary for the date diff --git a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml index 5d731663cb..289cdbc821 100644 --- a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml +++ b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml @@ -1,23 +1,6 @@ - - - - + -- cgit v1.2.3