From a6e33520737b9761744960c37597347916ea6109 Mon Sep 17 00:00:00 2001 From: Shyotl Date: Mon, 14 Jan 2013 23:09:12 -0600 Subject: [PATCH] Setting camera toolset as current sticks us into build mode (??)... Avoid when taking snapshots. --- indra/newview/lltoolmgr.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/newview/lltoolmgr.cpp b/indra/newview/lltoolmgr.cpp index efeb6bc2f..716edd7dd 100644 --- 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 freeze_time("FreezeTime",false); + return mBaseTool != LLToolPie::getInstance() && mBaseTool != gToolNull && (mCurrentToolset != gCameraToolset || !freeze_time); } bool LLToolMgr::canEdit()