diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-02-19 18:03:52 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-02-19 18:03:52 -0600 |
| commit | 615babe6187e14ece4a43ce713f9dfadf90de9d3 (patch) | |
| tree | ce895186849518b6ff7395f3153a8e5f4917e673 /indra/newview/llpanelobjectinventory.cpp | |
| parent | e09d45aef8e2d2167e2020a328c0606c8c2f492c (diff) | |
| parent | 7f36a12cbbbf4bd914d0890bd6235425753140eb (diff) | |
Merge
Diffstat (limited to 'indra/newview/llpanelobjectinventory.cpp')
| -rw-r--r-- | indra/newview/llpanelobjectinventory.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index f4ebb0c37f..13697cb8ba 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -1700,10 +1700,16 @@ void LLPanelObjectInventory::reset() mFolders->getFilter()->setShowFolderState(LLInventoryFilter::SHOW_ALL_FOLDERS); mFolders->setCallbackRegistrar(&mCommitCallbackRegistrar); + if (hasFocus()) + { + LLEditMenuHandler::gEditMenuHandler = mFolders; + } + LLRect scroller_rect(0, getRect().getHeight(), getRect().getWidth(), 0); LLScrollContainer::Params scroll_p; scroll_p.name("task inventory scroller"); scroll_p.rect(scroller_rect); + scroll_p.tab_stop(true); scroll_p.follows.flags(FOLLOWS_ALL); mScroller = LLUICtrlFactory::create<LLScrollContainer>(scroll_p); addChild(mScroller); |