From c1920e3c1c60fb792cf091750b05de618b355878 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Fri, 9 Nov 2007 01:56:15 +0000
Subject: EFFECTIVE MERGE: svn merge -r 70833:71458
 svn+ssh://svn/svn/linden/branches/maintenance-2 into release ACTUAL MERGE:
 svn merge -r 73210:73222
 svn+ssh://svn/svn/linden/qa/maintenance-2-merge-73206 into release

---
 indra/newview/llagent.cpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'indra/newview/llagent.cpp')

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 54f6741fee..d7e316438c 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -527,6 +527,21 @@ void LLAgent::resetView(BOOL reset_camera)
 	}
 }
 
+// Handle any actions that need to be performed when the main app gains focus
+// (such as through alt-tab).
+//-----------------------------------------------------------------------------
+// onAppFocusGained()
+//-----------------------------------------------------------------------------
+void LLAgent::onAppFocusGained()
+{
+	if (CAMERA_MODE_MOUSELOOK == mCameraMode)
+	{
+		changeCameraToDefault();
+		gToolMgr->clearSavedTool();
+	}
+}
+
+
 void LLAgent::ageChat()
 {
 	if (mAvatarObject)
-- 
cgit v1.2.3