From 5402c51de30da2a8fc946b123370940e035044bd Mon Sep 17 00:00:00 2001 From: angela Date: Wed, 17 Feb 2010 16:47:15 +0800 Subject: EXT-2593 Add border to Build > Contents Tab --- indra/newview/llpanelobjectinventory.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llpanelobjectinventory.cpp') diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index e8ae006968..d888f8d566 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -1568,7 +1568,7 @@ void LLPanelObjectInventory::reset() { clearContents(); - setBorderVisible(FALSE); + //setBorderVisible(FALSE); mCommitCallbackRegistrar.pushScope(); // push local callbacks -- cgit v1.3 From 363f4e877c0a3c7cac15b23645afb8d9337f1b6f Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Thu, 18 Feb 2010 18:36:13 -0800 Subject: EXT-5440 Deleting Script in Object contents deletes object when using delete key on keyboard reviewed by Richard --- indra/newview/llpanelobjectinventory.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra/newview/llpanelobjectinventory.cpp') 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(scroll_p); addChild(mScroller); -- cgit v1.3