From 26a38ab852edc31af1a5ccbcaf6b96f05974dde8 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Thu, 3 Dec 2009 17:37:10 -0800
Subject: 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.
---
indra/newview/llfolderview.cpp | 9 ---------
indra/newview/llfolderview.h | 1 -
2 files changed, 10 deletions(-)
(limited to 'indra')
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();
--
cgit v1.2.3