summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeth ProductEngine <slitovchuk@productengine.com>2012-05-29 02:12:51 +0300
committerSeth ProductEngine <slitovchuk@productengine.com>2012-05-29 02:12:51 +0300
commit2286dcb73bfddb9bd4102869005b14241053377d (patch)
tree98d353d34ab19b8b09bf4c76019a42607874376e
parent8a2b6f7d2e56625c59c3e40d4a23942a91b824a1 (diff)
CHUI-105 WIP Fixed "is not a child of" warning when removing a tab from LLSideTrayPanelContainer.
-rw-r--r--indra/llui/lltabcontainer.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp
index 5fc2cc350d..d0920685bf 100644
--- a/indra/llui/lltabcontainer.cpp
+++ b/indra/llui/lltabcontainer.cpp
@@ -1209,7 +1209,11 @@ void LLTabContainer::removeTabPanel(LLPanel* child)
update_images(mTabList[mTabList.size()-2], mLastTabParams, getTabPosition());
}
- removeChild( tuple->mButton );
+ if (!getTabsHidden())
+ {
+ // We need to remove tab buttons only if the tabs are not hidden.
+ removeChild( tuple->mButton );
+ }
delete tuple->mButton;
removeChild( tuple->mTabPanel );