diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-30 17:30:45 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-30 17:30:45 +0000 |
| commit | c2fbdab7f122123239715ea652d2bc126b5d1705 (patch) | |
| tree | 0eadbeea666ed1b2708dea8ca149b434e2e3cd7c /indra/newview | |
| parent | b9a6776a736e4b5cc440e678d8003eb7f23aed82 (diff) | |
lots more clean-up.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llstatusbar.cpp | 28 | ||||
| -rw-r--r-- | indra/newview/llstatusbar.h | 2 |
2 files changed, 1 insertions, 29 deletions
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp index d16a7c728b..4915720036 100644 --- a/indra/newview/llstatusbar.cpp +++ b/indra/newview/llstatusbar.cpp @@ -126,7 +126,6 @@ LLStatusBar::LLStatusBar(const LLRect& rect) mSGPacketLoss(NULL), mBtnBuyCurrency(NULL), mBtnVolume(NULL), - mPanelVolume(NULL), mBalance(0), mHealth(100), mSquareMetersCredit(0), @@ -163,8 +162,6 @@ LLStatusBar::LLStatusBar(const LLRect& rect) mBtnVolume->setClickedCallback( onClickVolume, this ); mBtnVolume->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterVolume, this)); - mPanelVolume = getChild<LLPanelVolumePulldown>( "volume_pulldown" ); - gSavedSettings.getControl("MuteAudio")->getSignal()->connect(boost::bind(&LLStatusBar::onVolumeChanged, this, _2)); childSetAction("scriptout", onClickScriptDebug, this); @@ -513,30 +510,7 @@ static void onClickScriptDebug(void*) void LLStatusBar::onMouseEnterVolume(LLUICtrl* ctrl) { // show the master volume pull-down - -#if 1 - //LLFloater* vp = - LLFloaterReg::showInstance("volume_pulldown"); //tmp -#else - //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->setShape(LLRect(1,1,100,100)); - sb->mPanelVolume->setBackgroundColor(LLColor3(1.0, 0.0, 0.0)); - sb->mPanelVolume->setVisible(TRUE); - sb->mPanelVolume->setEnabled(TRUE); - sb->addChild(sb->mPanelVolume); - gFloaterView->addChild(sb->mPanelVolume); - sb->mPanelVolume->getParent()->sendChildToFront(sb->mPanelVolume); - gFocusMgr.setTopCtrl(sb->mPanelVolume); - // also set focus explicitly to mpanelvolume - - //sb->mPanelVolume->setFrontmost() -#endif + LLFloaterReg::showInstance("volume_pulldown"); } static void onClickVolume(void* data) diff --git a/indra/newview/llstatusbar.h b/indra/newview/llstatusbar.h index 347530806e..f77cc1acb8 100644 --- a/indra/newview/llstatusbar.h +++ b/indra/newview/llstatusbar.h @@ -87,8 +87,6 @@ public: S32 getSquareMetersCommitted() const; S32 getSquareMetersLeft() const; - LLPanelVolumePulldown *mPanelVolume; - private: // simple method to setup the part that holds the date void setupDate(); |