diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-03 11:41:35 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-03 11:41:35 +0000 |
| commit | 962362503633f9fba741b1a45eb05b75a18a9f7d (patch) | |
| tree | c70e936c416d1183f6f6d99de5f7a5554c0996cb /indra/newview/llfolderview.cpp | |
| parent | f7ecfe6dc453bf06c24934b58f67637790fe3c44 (diff) | |
| parent | 0e780c9b912913b3eddde251b62f6218df4c5587 (diff) | |
PE 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; } |