diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-03-03 11:07:52 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-03-03 11:07:52 -0500 |
| commit | 8e37dd516ab68bf11aaa9ab76945de36053df057 (patch) | |
| tree | fa790d4832fc46c1b9349314f1b7d1fef8987acd /indra/newview/llfolderview.cpp | |
| parent | 0ac63ffbb1acb32278645f6a9ab97cdc271c8d30 (diff) | |
| parent | f53f121eb069dbf50334c424390151074d4fcad7 (diff) | |
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview/llfolderview.cpp')
| -rw-r--r-- | indra/newview/llfolderview.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 23f19a38a6..f7fd7bb472 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -179,6 +179,7 @@ LLFolderView::LLFolderView(const Params& p) mSourceID(p.task_id), mRenameItem( NULL ), mNeedsScroll( FALSE ), + mEnableScroll( true ), mPinningSelectedItem(FALSE), mNeedsAutoSelect( FALSE ), mAutoSelectOverride(FALSE), @@ -1913,7 +1914,7 @@ void LLFolderView::deleteAllChildren() void LLFolderView::scrollToShowSelection() { - if (mSelectedItems.size()) + if (mEnableScroll && mSelectedItems.size()) { mNeedsScroll = TRUE; } |