diff options
| author | angela <angela@lindenlab.com> | 2010-03-04 10:35:51 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2010-03-04 10:35:51 +0800 |
| commit | f9815a6d13074cc3d1adda5aa41171f855097977 (patch) | |
| tree | e960736102bb2a4f9cd46a6cbf7e04d4e0f0b187 /indra/newview/llfolderview.cpp | |
| parent | 06b5cd096f9125c8c9b472487e841c19f5e62015 (diff) | |
| parent | 2b5ea03a40c7bdd5962dc25c807b4ce5abb49bde (diff) | |
merge
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; } |