diff options
author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-12-04 17:03:34 -0500 |
---|---|---|
committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-12-04 17:03:34 -0500 |
commit | 938c51d2a483962556ee183c24e2b3f635f2c56b (patch) | |
tree | 962440abff0e5aa3dfa0fdf34b25f96780bcb3be /indra/newview/llfolderview.cpp | |
parent | 01f61d4d9e7763cbbf9e21673cb23f71a792e9c4 (diff) | |
parent | fa8b2135f5eaf92b24abe79f908a62e7e2c0a076 (diff) |
merge to pull viewer-2 changes into avp
--HG--
branch : avatar-pipeline
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 8bea8850b6..4e77b42187 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()) |