Merge branch 'mccabe-plugins' into plugins_merge

Conflicts:
	linden/doc/contributions.txt
	linden/indra/cmake/GStreamer.cmake
	linden/indra/cmake/LLMedia.cmake
	linden/indra/cmake/OPENAL.cmake
	linden/indra/llmedia/CMakeLists.txt
	linden/indra/llprimitive/material_codes.h
	linden/indra/newview/chatbar_as_cmdline.cpp
	linden/indra/newview/llappviewer.cpp
	linden/indra/newview/llfloatertos.cpp
	linden/indra/newview/llstartup.cpp
	linden/indra/newview/llviewerwindow.cpp
	linden/indra/newview/llvoavatar.cpp
	linden/indra/newview/pipeline.cpp
	linden/indra/newview/pipeline.h
	linden/indra/newview/viewer_manifest.py
	linden/install.xml

1 files changed, 1 insertions, 1 deletions

diff --git a/linden/indra/newview/lltoolpie.h b/linden/indra/newview/lltoolpie.h
index 113fba7..54bf409 100644
--- a/linden/indra/newview/lltoolpie.h
+++ b/linden/indra/newview/lltoolpie.h
@@ -51,6 +51,7 @@ public:
         virtual BOOL            handleRightMouseUp(S32 x, S32 y, MASK mask);
         virtual BOOL            handleHover(S32 x, S32 y, MASK mask);
         virtual BOOL            handleDoubleClick(S32 x, S32 y, MASK mask);
+        virtual BOOL            handleScrollWheel(S32 x, S32 y, S32 clicks);
 
         virtual void            render();
 
@@ -85,7 +86,6 @@ private:
         LLPickInfo                      mPick;
         U8                                      mClickAction;
         LLSafeHandle<LLObjectSelection> mLeftClickSelection;
-protected:
         LLPointer<LLViewerObject> mClickActionObject;
 };