diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-01 18:19:45 -0700 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-01 18:19:45 -0700 |
| commit | dde2153014cd7d7b8fa704f7067a41344bfbb1c2 (patch) | |
| tree | f7633ccef179644660897c8bf3684abeda3545f8 /indra/newview/llstatusbar.cpp | |
| parent | 9b8b0571645f8b607ecc24221c807cc02a03692f (diff) | |
| parent | 85ea690d47208f6dda020c8ff81021179fbdd0b8 (diff) | |
merge of latest lindenlab/svn-imports-viewer-20
Diffstat (limited to 'indra/newview/llstatusbar.cpp')
| -rw-r--r-- | indra/newview/llstatusbar.cpp | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp index d7df258750..b0930cd86d 100644 --- a/indra/newview/llstatusbar.cpp +++ b/indra/newview/llstatusbar.cpp @@ -225,22 +225,14 @@ void LLStatusBar::draw() BOOL LLStatusBar::handleRightMouseDown(S32 x, S32 y, MASK mask) { - if (mHideNavbarContextMenu) - { - mHideNavbarContextMenu->buildDrawLabels(); - mHideNavbarContextMenu->updateParent(LLMenuGL::sMenuContainer); - LLMenuGL::showPopup(this, mHideNavbarContextMenu, x, y); - } - + show_navbar_context_menu(this,x,y); return TRUE; } BOOL LLStatusBar::postBuild() { - mHideNavbarContextMenu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_hide_navbar.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance()); - gMenuHolder->addChild(mHideNavbarContextMenu); - gMenuBarView->setRightMouseDownCallback(boost::bind(&LLStatusBar::onMainMenuRightClicked, this, _1, _2, _3, _4)); + gMenuBarView->setRightMouseDownCallback(boost::bind(&show_navbar_context_menu, _1, _2, _3)); return TRUE; } @@ -560,11 +552,6 @@ void LLStatusBar::setupDate() } } -void LLStatusBar::onMainMenuRightClicked(LLUICtrl* ctrl, S32 x, S32 y, MASK mask) -{ - handleRightMouseDown(x, y, mask); -} - // static void LLStatusBar::onClickStatGraph(void* data) { |