summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolmgr.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2016-03-21 11:00:22 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2016-03-21 11:00:22 -0400
commit2afde26d93cc8773f5e84d187844f909347fc1bf (patch)
tree5857549829b90f047ae094ebd9b6a9d2817d59aa /indra/newview/lltoolmgr.cpp
parent132a2587dff85006636d8092ae1b34081f12fe69 (diff)
parent4aae7b51616c0963af4668442bdb5bfaba8c5044 (diff)
merge
Diffstat (limited to 'indra/newview/lltoolmgr.cpp')
-rwxr-xr-xindra/newview/lltoolmgr.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/lltoolmgr.cpp b/indra/newview/lltoolmgr.cpp
index 3ecb4015ce..2f8e464b71 100755
--- a/indra/newview/lltoolmgr.cpp
+++ b/indra/newview/lltoolmgr.cpp
@@ -400,6 +400,9 @@ void LLToolMgr::clearTransientTool()
void LLToolMgr::onAppFocusLost()
{
+ if (LLApp::isQuitting())
+ return;
+
if (mSelectedTool)
{
mSelectedTool->handleDeselect();