Merge from q/viewer-release to dessie/viewer-release for 2.1.1 beta 1

1 files changed, 1 insertions, 20 deletions

diff --git a/indra/llui/llflatlistview.cpp b/indra/llui/llflatlistview.cpp
index 6eb214cb93..d1c0b38809 100644
--- a/indra/llui/llflatlistview.cpp
+++ b/indra/llui/llflatlistview.cpp
@@ -1048,26 +1048,7 @@ void LLFlatListView::setNoItemsCommentVisible(bool visible) const
 {
 	if (mNoItemsCommentTextbox)
 	{
-		if (visible)
-		{
-/*
-// *NOTE: MA 2010-02-04
-// Deprecated after params of the comment text box were moved into widget (flat_list_view.xml)
-// can be removed later if nothing happened.
-			// We have to update child rect here because of issues with rect after reshaping while creating LLTextbox
-			// It is possible to have invalid LLRect if Flat List is in LLAccordionTab
-			LLRect comment_rect = getLocalRect();
-
-			// To see comment correctly (EXT - 3244) in mNoItemsCommentTextbox we must get border width
-			// of LLFlatListView (@see getBorderWidth()) and stretch mNoItemsCommentTextbox to this width
-			// But getBorderWidth() returns 0 if LLFlatListView not visible. So we have to get border width
-			// from 'scroll_border'
-			LLViewBorder* scroll_border = getChild<LLViewBorder>("scroll border");
-			comment_rect.stretch(-scroll_border->getBorderWidth());
-			mNoItemsCommentTextbox->setRect(comment_rect);
-*/
-		}
-		mSelectedItemsBorder->setVisible(FALSE);
+		mSelectedItemsBorder->setVisible(!visible);
 		mNoItemsCommentTextbox->setVisible(visible);
 	}
 }