From 71babaf8824a3b73521ac2486a5e3cea191a7305 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Tue, 10 Mar 2015 11:29:17 +0200
Subject: MAINT-147 FIXED Allow follow cam scripts after closing Build tools
 floater.

---
 indra/newview/llfloatertools.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

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

diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp
index 7477b02867..6dbb202c9d 100755
--- a/indra/newview/llfloatertools.cpp
+++ b/indra/newview/llfloatertools.cpp
@@ -92,6 +92,7 @@
 // Globals
 LLFloaterTools *gFloaterTools = NULL;
 bool LLFloaterTools::sShowObjectCost = true;
+bool LLFloaterTools::sPreviousFocusOnAvatar = false;
 
 const std::string PANEL_NAMES[LLFloaterTools::PANEL_COUNT] =
 {
@@ -891,6 +892,12 @@ void LLFloaterTools::onClose(bool app_quitting)
 
 	// prepare content for next call
 	mPanelContents->clearContents();
+
+	if(sPreviousFocusOnAvatar)
+	{
+		sPreviousFocusOnAvatar = false;
+		gAgentCamera.setAllowChangeToFollow(TRUE);
+	}
 }
 
 void click_popup_info(void*)
-- 
cgit v1.2.3