diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-03-03 12:10:00 -0800 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-03-03 12:10:00 -0800 |
| commit | e47d107e2f7c4793f0685aa37749629f7d91aef0 (patch) | |
| tree | 740e36a63f6576bdf5c180ca8b59796ae5f1cf49 /indra/newview/llfolderview.cpp | |
| parent | ece36d5df8d0a7fb4c71ec50a0bac49a5c6fbacb (diff) | |
| parent | 2ecc98cb2f11b03224990d498d20cff8bcfb0716 (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; } |