diff options
| author | James Cook <james@lindenlab.com> | 2009-11-12 13:45:22 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-11-12 13:45:22 -0800 |
| commit | fc6b3d4caadf2dfe11504a0d3fa2a96f6135320b (patch) | |
| tree | 192640c9d7a2be21331ff5e41947929920b310ee /indra/newview/llfolderviewitem.cpp | |
| parent | 3e73b75fa21392e09861dd2acd1d169a3881cc61 (diff) | |
| parent | ab3cb6d9371df29344943bd58a1433a6d7d7b159 (diff) | |
merge
Diffstat (limited to 'indra/newview/llfolderviewitem.cpp')
| -rw-r--r-- | indra/newview/llfolderviewitem.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp index 6fdaefd21a..5db35d5f70 100644 --- a/indra/newview/llfolderviewitem.cpp +++ b/indra/newview/llfolderviewitem.cpp @@ -388,7 +388,9 @@ BOOL LLFolderViewItem::addToFolder(LLFolderViewFolder* folder, LLFolderView* roo // makes sure that this view and it's children are the right size. S32 LLFolderViewItem::arrange( S32* width, S32* height, S32 filter_generation) { - mIndentation = mParentFolder ? mParentFolder->getIndentation() + LEFT_INDENTATION : 0; + mIndentation = getParentFolder() && getParentFolder()->getParentFolder() + ? mParentFolder->getIndentation() + LEFT_INDENTATION + : 0; if (mLabelWidthDirty) { mLabelWidth = ARROW_SIZE + TEXT_PAD + ICON_WIDTH + ICON_PAD + getLabelFontForStyle(mLabelStyle)->getWidth(mSearchableLabel); |