diff options
| author | Dessie Linden <dessie@lindenlab.com> | 2010-07-07 08:36:21 -0700 |
|---|---|---|
| committer | Dessie Linden <dessie@lindenlab.com> | 2010-07-07 08:36:21 -0700 |
| commit | f6ac20860fb5110571802dd0a5ac76d236855ba7 (patch) | |
| tree | 63731864000d07323e867d333da4f6f778bbdae1 /indra/llui | |
| parent | a6b108641489caca1717b98cb888ef2de923f1fc (diff) | |
| parent | aef4f6ccabe0b2f72296f1a4ae5634080396690a (diff) | |
Merged from viewer-release
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llaccordionctrl.cpp | 6 | ||||
| -rw-r--r-- | indra/llui/llflatlistview.cpp | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/indra/llui/llaccordionctrl.cpp b/indra/llui/llaccordionctrl.cpp index 237d42090f..673631f99a 100644 --- a/indra/llui/llaccordionctrl.cpp +++ b/indra/llui/llaccordionctrl.cpp @@ -374,6 +374,12 @@ void LLAccordionCtrl::removeCollapsibleCtrl(LLView* view) break; } } + + // if removed is selected - reset selection + if (mSelectedTab == view) + { + mSelectedTab = NULL; + } } void LLAccordionCtrl::initNoTabsWidget(const LLTextBox::Params& tb_params) diff --git a/indra/llui/llflatlistview.cpp b/indra/llui/llflatlistview.cpp index b87851490d..6eb214cb93 100644 --- a/indra/llui/llflatlistview.cpp +++ b/indra/llui/llflatlistview.cpp @@ -1067,6 +1067,7 @@ void LLFlatListView::setNoItemsCommentVisible(bool visible) const mNoItemsCommentTextbox->setRect(comment_rect); */ } + mSelectedItemsBorder->setVisible(FALSE); mNoItemsCommentTextbox->setVisible(visible); } } @@ -1096,7 +1097,10 @@ void LLFlatListView::getValues(std::vector<LLSD>& values) const // virtual void LLFlatListView::onFocusReceived() { - mSelectedItemsBorder->setVisible(TRUE); + if (size()) + { + mSelectedItemsBorder->setVisible(TRUE); + } gEditMenuHandler = this; } // virtual |