merge

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