summaryrefslogtreecommitdiff
path: root/indra/newview/llfolderview.cpp
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-01-04 15:04:38 -0800
committerLeyla Farazha <leyla@lindenlab.com>2010-01-04 15:04:38 -0800
commit53abe3c7802b8c8579ce868b4ecb05d9ebdd20ef (patch)
tree4a2c9b325f6ceb75403db9d29e1efa583de434e3 /indra/newview/llfolderview.cpp
parent34328eed67a10ccca73ec78cd70488ac35f2ee91 (diff)
parent1355d16d2f24f9d623df70059b1f0001cf673209 (diff)
Merge
Diffstat (limited to 'indra/newview/llfolderview.cpp')
-rw-r--r--indra/newview/llfolderview.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index 474d2ca21f..112b23d2df 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -206,7 +206,8 @@ LLFolderView::LLFolderView(const Params& p)
mAutoOpenCandidate = NULL;
mAutoOpenTimer.stop();
mKeyboardSelection = FALSE;
- mIndentation = -LEFT_INDENTATION; // children start at indentation 0
+ static LLUICachedControl<S32> indentation("FolderIndentation", 0);
+ mIndentation = -indentation; // children start at indentation 0
gIdleCallbacks.addFunction(idle, this);
//clear label