diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-07 16:04:24 +0200 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-07 16:04:24 +0200 |
commit | dc6ce7f7826592c37810efa686f64ec2cf8a15ee (patch) | |
tree | e770ee51180e855c7da7d4b98fc631d0a06e95bc /indra/newview/llfolderview.cpp | |
parent | 6eee48e16e75c1f70bb1cbce9544bad63d9621cf (diff) | |
parent | fefb08eef53da3cb0204d31f349aabfa6369f10b (diff) |
Manual merge from default branch.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llfolderview.cpp')
-rw-r--r-- | indra/newview/llfolderview.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index ab49739d58..6a3462f201 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -1803,15 +1803,6 @@ BOOL LLFolderView::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, return handled; } -BOOL LLFolderView::handleScrollWheel(S32 x, S32 y, S32 clicks) -{ - if (mScrollContainer) - { - return mScrollContainer->handleScrollWheel(x, y, clicks); - } - return FALSE; -} - void LLFolderView::deleteAllChildren() { if(mRenamer == gFocusMgr.getTopCtrl()) |