diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-02-18 18:36:13 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-02-18 18:36:13 -0800 |
| commit | 363f4e877c0a3c7cac15b23645afb8d9337f1b6f (patch) | |
| tree | beea9c6deee40ad458e388522b7f5fff053c821c /indra | |
| parent | c4b42ca78ff214eef66e9fafa369edd3c4ac08c0 (diff) | |
EXT-5440 Deleting Script in Object contents deletes object when using delete key on keyboard
reviewed by Richard
Diffstat (limited to 'indra')
| -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 d888f8d566..5ddbdf7f01 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -1583,10 +1583,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); |