diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-05-10 18:29:00 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-05-10 18:29:00 -0700 |
| commit | cc87c6785258cb04f11cb79ce2e9899d33f11e03 (patch) | |
| tree | fcc057e96fbd8af5a5664bf4036d79ce4c6e92e0 /indra/llui/llfolderview.cpp | |
| parent | 7c4bfc8f55ebc581ddac0c2394b07b24d240d1a6 (diff) | |
| parent | fb27eae15502cbd2a13cde018ae67f961320d0ba (diff) | |
Pull merge from viewer-fbc
Diffstat (limited to 'indra/llui/llfolderview.cpp')
| -rw-r--r-- | indra/llui/llfolderview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp index 9cf822892e..20eade892d 100644 --- a/indra/llui/llfolderview.cpp +++ b/indra/llui/llfolderview.cpp @@ -185,7 +185,7 @@ LLFolderView::LLFolderView(const Params& p) mAutoOpenCandidate = NULL; mAutoOpenTimer.stop(); mKeyboardSelection = FALSE; - mIndentation = p.folder_indentation; + mIndentation = getParentFolder() ? getParentFolder()->getIndentation() + mLocalIndentation : 0; //clear label // go ahead and render root folder as usual |