1 files changed, 6 insertions, 8 deletions

diff --git a/linden/indra/newview/lltoolmgr.cpp b/linden/indra/newview/lltoolmgr.cpp
index 3a776d1..8204374 100644
--- a/linden/indra/newview/lltoolmgr.cpp
+++ b/linden/indra/newview/lltoolmgr.cpp
@@ -281,22 +281,20 @@ void LLToolMgr::clearTransientTool()
 }
 
 
-// The "gun tool", used for handling mouselook, captures the mouse and
-// locks it within the window.  When the app loses focus we need to
-// release this locking.
 void LLToolMgr::onAppFocusLost()
 {
-        mSavedTool = mBaseTool;
-        mBaseTool = gToolNull;
+        if (mSelectedTool)
+        {
+                mSelectedTool->handleDeselect();
+        }
         updateToolStatus();
 }
 
 void LLToolMgr::onAppFocusGained()
 {
-        if (mSavedTool)
+        if (mSelectedTool)
         {
-                mBaseTool = mSavedTool;
-                mSavedTool = NULL;
+                mSelectedTool->handleSelect();
         }
         updateToolStatus();
 }