Setting camera toolset as current sticks us into build mode (??)... Avoid when taking snapshots.

2013-01-14 23:09:12 -06:00
parent 2a8f55e99e
commit a6e3352073
1 changed files with 2 additions and 1 deletions
--- a/indra/newview/lltoolmgr.cpp
+++ b/indra/newview/lltoolmgr.cpp
@@ -272,7 +272,8 @@ void LLToolMgr::updateToolStatus()

 bool LLToolMgr::inEdit()
 {
-	return mBaseTool != LLToolPie::getInstance() && mBaseTool != gToolNull;
+	static const LLCachedControl<bool> freeze_time("FreezeTime",false);
+	return mBaseTool != LLToolPie::getInstance() && mBaseTool != gToolNull && (mCurrentToolset != gCameraToolset || !freeze_time);
 }

 bool LLToolMgr::canEdit()