QAR-427

merge 3dconnex-merge -r 84010 : 84039 -> release

1 files changed, 15 insertions, 0 deletions

diff --git a/indra/newview/lltoolmgr.cpp b/indra/newview/lltoolmgr.cpp
index b20d4f9d28..a4c7856411 100644
--- a/indra/newview/lltoolmgr.cpp
+++ b/indra/newview/lltoolmgr.cpp
@@ -49,6 +49,8 @@
 #include "lltoolselectland.h"
 #include "lltoolobjpicker.h"
 #include "lltoolpipette.h"
+#include "llagent.h"
+#include "llviewercontrol.h"
 
 
 // Used when app not active to avoid processing hover.
@@ -227,6 +229,19 @@ BOOL LLToolMgr::inEdit()
 	return mBaseTool != LLToolPie::getInstance() && mBaseTool != gToolNull;
 }
 
+bool LLToolMgr::inBuildMode()
+{
+	// when entering mouselook inEdit() immediately returns true before 
+	// cameraMouselook() actually starts returning true.  Also, appearance edit
+	// sets build mode to true, so let's exclude that.
+	bool b=(inEdit() 
+			&& gSavedSettings.getBOOL("BuildBtnState")
+			&& !gAgent.cameraMouselook()
+			&& mCurrentToolset != gFaceEditToolset);
+	
+	return b;
+}
+
 void LLToolMgr::setTransientTool(LLTool* tool)
 {
 	if (!tool)