diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-05-09 16:02:03 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-05-09 16:02:03 -0700 |
| commit | 359c3d520eaf8de818081db32812387416add26a (patch) | |
| tree | 86d034e51cf985eb817b0759e1a214b7080fae91 /indra/llui/llfolderviewitem.cpp | |
| parent | 2d65482d7152b613409a071e0a117d38f350932a (diff) | |
ACME-342 Format the PersonView so that it shows the avatar icon, SL name, FB icon, and FB name: Rendering now matches the UX spec.
Diffstat (limited to 'indra/llui/llfolderviewitem.cpp')
| -rwxr-xr-x | indra/llui/llfolderviewitem.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp index 0c0c54c38c..f061313645 100755 --- a/indra/llui/llfolderviewitem.cpp +++ b/indra/llui/llfolderviewitem.cpp @@ -307,7 +307,12 @@ std::set<LLFolderViewItem*> LLFolderViewItem::getSelectionList() const // addToFolder() returns TRUE if it succeeds. FALSE otherwise void LLFolderViewItem::addToFolder(LLFolderViewFolder* folder) { - folder->addItem(this); + folder->addItem(this); + + // Compute indentation since parent folder changed + mIndentation = (getParentFolder()) + ? getParentFolder()->getIndentation() + mLocalIndentation + : 0; } @@ -940,6 +945,11 @@ LLFolderViewFolder::~LLFolderViewFolder( void ) void LLFolderViewFolder::addToFolder(LLFolderViewFolder* folder) { folder->addFolder(this); + + // Compute indentation since parent folder changed + mIndentation = (getParentFolder()) + ? getParentFolder()->getIndentation() + mLocalIndentation + : 0; } static LLFastTimer::DeclareTimer FTM_ARRANGE("Arrange"); |