livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
meow-7.2.2
James Cook 2009-12-03 17:37:10 -08:00
parent 275b4f5849
commit 26a38ab852
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llfolderview.cpp
View File

@ -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())

1
indra/newview/llfolderview.h
View File

@ -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();