diff options
| author | James Cook <james@lindenlab.com> | 2009-12-03 17:37:10 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-03 17:37:10 -0800 |
| commit | 26a38ab852edc31af1a5ccbcaf6b96f05974dde8 (patch) | |
| tree | a68449435c914eb57d514d11095f455aaa2f5dd8 | |
| parent | 275b4f58496c4a6a8eb81e94701db858d5ecb99a (diff) | |
EXT-2954 Crash when using the mousewheel in any inventory panel
LLFolderView was explicitly passing scroll events back to its
parent LLScrollContainer, which it didn't need to do. It may not have
exhibited an infinite loop before due to bugs in the border width
computations for scroll rectangles. Reviewed with Leyla.
| -rw-r--r-- | indra/newview/llfolderview.cpp | 9 | ||||
| -rw-r--r-- | indra/newview/llfolderview.h | 1 |
2 files changed, 0 insertions, 10 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()) diff --git a/indra/newview/llfolderview.h b/indra/newview/llfolderview.h index a0e252ae88..eaaba8c13d 100644 --- a/indra/newview/llfolderview.h +++ b/indra/newview/llfolderview.h @@ -230,7 +230,6 @@ public: EAcceptance* accept, std::string& tooltip_msg); /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE); - virtual BOOL handleScrollWheel(S32 x, S32 y, S32 clicks); virtual void draw(); virtual void deleteAllChildren(); |