diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-03-04 16:59:57 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-03-04 16:59:57 +0000 |
| commit | a10f9639004b4eedc3b6e7b624912ff4ebd8fdc5 (patch) | |
| tree | 051625f9ac6a0d08f613cf11da318c3fd30b06a9 /indra/newview/llfloatertools.cpp | |
| parent | 62d9c7f76ce4953064fbc2a778ad4ecefb918e01 (diff) | |
svn merge -r 81304:81392 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-8-merge
QAR-343 - merge maint-ui-7 and maint-ui-8 to release
Diffstat (limited to 'indra/newview/llfloatertools.cpp')
| -rw-r--r-- | indra/newview/llfloatertools.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index 8879be2e51..6c65ace89a 100644 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -759,6 +759,9 @@ void LLFloaterTools::onOpen() { mParcelSelection = gParcelMgr->getFloatingParcelSelection(); mObjectSelection = gSelectMgr->getEditSelection(); + + gMenuBarView->setItemVisible("Tools", TRUE); + gMenuBarView->arrange(); } // virtual @@ -788,6 +791,9 @@ void LLFloaterTools::onClose(bool app_quitting) // we were already in basic toolset, using build tools // so manually reset tool to default (pie menu tool) gToolMgr->getCurrentToolset()->selectFirstTool(); + + gMenuBarView->setItemVisible("Tools", FALSE); + gMenuBarView->arrange(); } void LLFloaterTools::showMore(BOOL show_more) |