diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-27 14:56:13 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-27 14:56:13 +0000 |
| commit | 6d515c1c6def9f0074de0d624ce13ada3b4d4b59 (patch) | |
| tree | dbc3ecd2294a573ca492a3c7ba4eb1a3280d22a2 /indra | |
| parent | cf485a384ba8cd5249ae11949fe3464252f5ba06 (diff) | |
back to the floater version of the volume drop-down - I was having no luck with having the panel version display properly.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llstatusbar.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp index ed125e0a59..89c007280e 100644 --- a/indra/newview/llstatusbar.cpp +++ b/indra/newview/llstatusbar.cpp @@ -247,7 +247,6 @@ BOOL LLStatusBar::handleRightMouseDown(S32 x, S32 y, MASK mask) BOOL LLStatusBar::postBuild() { - gMenuBarView->setRightMouseDownCallback(boost::bind(&show_navbar_context_menu, _1, _2, _3)); return TRUE; @@ -517,7 +516,10 @@ static void onClickVolume(void* data) // toggle the master volume pull-down - //LLFloaterReg::showInstance("volume_pulldown"); //tmp + //LLFloater* vp = + LLFloaterReg::showInstance("volume_pulldown"); //tmp + +#if 0 //LLPanelVolumePulldown *foo= //new LLPanelVolumePulldown(); //LLPanel* container = getRootView();//->getChild<LLPanel>("nav_bar_container"); @@ -530,9 +532,13 @@ static void onClickVolume(void* data) 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 } // sets the static variables necessary for the date |