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, 5 insertions, 2 deletions

diff --git a/linden/indra/newview/lltoolgun.cpp b/linden/indra/newview/lltoolgun.cpp
index d21fd49..f7af018 100644
--- a/linden/indra/newview/lltoolgun.cpp
+++ b/linden/indra/newview/lltoolgun.cpp
@@ -49,7 +49,8 @@
 #include "lltoolgrab.h"
 
 LLToolGun::LLToolGun( LLToolComposite* composite )
-:       LLTool( std::string("gun"), composite )
+:       LLTool( std::string("gun"), composite ),
+                mIsSelected(FALSE)
 {
 }
 
@@ -58,6 +59,7 @@ void LLToolGun::handleSelect()
         gViewerWindow->hideCursor();
         gViewerWindow->moveCursorToCenter();
         gViewerWindow->mWindow->setMouseClipping(TRUE);
+        mIsSelected = TRUE;
 }
 
 void LLToolGun::handleDeselect()
@@ -65,6 +67,7 @@ void LLToolGun::handleDeselect()
         gViewerWindow->moveCursorToCenter();
         gViewerWindow->showCursor();
         gViewerWindow->mWindow->setMouseClipping(FALSE);
+        mIsSelected = FALSE;
 }
 
 BOOL LLToolGun::handleMouseDown(S32 x, S32 y, MASK mask)
@@ -77,7 +80,7 @@ BOOL LLToolGun::handleMouseDown(S32 x, S32 y, MASK mask)
 
 BOOL LLToolGun::handleHover(S32 x, S32 y, MASK mask) 
 {
-        if( gAgent.cameraMouselook() )
+        if( gAgent.cameraMouselook() && mIsSelected )
         {
                 const F32 NOMINAL_MOUSE_SENSITIVITY = 0.0025f;