diff options
author | Oz Linden <oz@lindenlab.com> | 2016-08-11 15:36:09 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2016-08-11 15:36:09 -0400 |
commit | 6ff420d705625fef4b0456c19bb9c766cabb31af (patch) | |
tree | 16c27571df04932dd830b35e06cdf4e9b5dbf07e /indra/llui/llfolderviewitem.cpp | |
parent | c32b27f5b77c7d8e53b11163d04f2842949d71de (diff) | |
parent | 4fb100ac7a33174883184f1320d0beac08ead3a7 (diff) |
merge changes for 4.0.7-release
Diffstat (limited to 'indra/llui/llfolderviewitem.cpp')
-rw-r--r-- | indra/llui/llfolderviewitem.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp index 3def0386e1..5eb5ca4f82 100644 --- a/indra/llui/llfolderviewitem.cpp +++ b/indra/llui/llfolderviewitem.cpp @@ -972,6 +972,11 @@ void LLFolderViewFolder::addToFolder(LLFolderViewFolder* folder) mIndentation = (getParentFolder()) ? getParentFolder()->getIndentation() + mLocalIndentation : 0; + + if(isOpen() && folder->isOpen()) + { + requestArrange(); + } } static LLTrace::BlockTimerStatHandle FTM_ARRANGE("Arrange"); |