diff options
author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-09-22 22:51:33 +0300 |
---|---|---|
committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-09-22 22:51:33 +0300 |
commit | 730af5d4888653ce2ccb4bae6dd3919619d58a30 (patch) | |
tree | b9b5f7f7b9bfdca690c317dc8c90a23f0a2dd1bf /indra/newview/lltoolpie.cpp | |
parent | bdedfb3755d54a6b4468a5251c9ddeae2b092d37 (diff) | |
parent | 60ed688026269568a9eef67437dc780f88c92871 (diff) |
Merged master (DRTVWR-503) into DRTVWR-482
Diffstat (limited to 'indra/newview/lltoolpie.cpp')
-rw-r--r-- | indra/newview/lltoolpie.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index f499c34ca4..12346f16d7 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -1449,7 +1449,7 @@ LLTool* LLToolPie::getOverrideTool(MASK mask) { if (gSavedSettings.getBOOL("EnableGrab")) { - if (mask == MASK_CONTROL) + if (mask == DEFAULT_GRAB_MASK) { return LLToolGrab::getInstance(); } |