Skip to content
Snippets Groups Projects
Commit 7c340079 authored by Tofu Linden's avatar Tofu Linden
Browse files

more attempts to panelize the volume pulldown, but why won't it show?

parent 75b89527
No related branches found
No related tags found
No related merge requests found
......@@ -124,6 +124,7 @@ LLStatusBar::LLStatusBar(const LLRect& rect)
mSGPacketLoss(NULL),
mBtnBuyCurrency(NULL),
mBtnVolume(NULL),
mPanelVolume(NULL),
mBalance(0),
mHealth(100),
mSquareMetersCredit(0),
......@@ -159,6 +160,8 @@ LLStatusBar::LLStatusBar(const LLRect& rect)
mBtnVolume = getChild<LLButton>( "volume_btn" );
mBtnVolume->setClickedCallback( onClickVolume, this );
mPanelVolume = getChild<LLPanel>( "volume_pulldown" );
gSavedSettings.getControl("MuteAudio")->getSignal()->connect(boost::bind(&LLStatusBar::onVolumeChanged, this, _2));
childSetAction("scriptout", onClickScriptDebug, this);
......@@ -511,10 +514,17 @@ static void onClickVolume(void* data)
gSavedSettings.setBOOL("MuteAudio", !mute_audio);
// toggle the master volume pull-down
//LLFloaterReg::showInstance("volume_pulldown"); //tmp
LLPanelVolumePulldown *foo=
new LLPanelVolumePulldown();
foo->setVisible(TRUE);
//LLPanelVolumePulldown *foo=
//new LLPanelVolumePulldown();
//LLPanel* container = getRootView();//->getChild<LLPanel>("nav_bar_container");
//container->addChild(foo);
LLStatusBar *sb = (LLStatusBar*)(data);
llassert_always(sb);
sb->mPanelVolume->setRect(LLRect(1,1,100,100));
sb->mPanelVolume->setVisible(TRUE);
sb->mPanelVolume->setEnabled(TRUE);
}
// sets the static variables necessary for the date
......
......@@ -87,6 +87,8 @@ class LLStatusBar
S32 getSquareMetersCommitted() const;
S32 getSquareMetersLeft() const;
LLPanel *mPanelVolume;
private:
// simple method to setup the part that holds the date
void setupDate();
......@@ -94,7 +96,6 @@ class LLStatusBar
void onVolumeChanged(const LLSD& newvalue);
static void onClickStatGraph(void* data);
private:
LLTextBox *mTextHealth;
......
......@@ -82,6 +82,17 @@
name="volume_btn"
tool_tip="Global Volume Control"
width="16" />
<panel
class="panel_volume_pulldown"
filename="panel_volume_pulldown.xml"
follows="all"
height="533"
layout="topleft"
left="0"
name="volume_pulldown"
top="5"
visible="false"
width="313" />
<text
enabled="true"
follows="right|bottom"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment