diff options
| author | Rider Linden <rider@lindenlab.com> | 2016-10-17 15:57:03 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2016-10-17 15:57:03 -0700 |
| commit | 877c01f3f2632c52e9ed116c813f5c187e7ab863 (patch) | |
| tree | 4c8e80d3992d1f390aadfda1ce9ec58eaaf512b7 /indra/newview/lltoolcomp.cpp | |
| parent | 826afcaf387ad0d589ac5ea1305dec9d04a22139 (diff) | |
| parent | 881fe0a11712150972fea4a65d1082149fb3e6ec (diff) | |
Merged lindenlab/viewer-bear into default
Diffstat (limited to 'indra/newview/lltoolcomp.cpp')
| -rw-r--r-- | indra/newview/lltoolcomp.cpp | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/indra/newview/lltoolcomp.cpp b/indra/newview/lltoolcomp.cpp index 76a791c6e9..2b4fa757f6 100644 --- a/indra/newview/lltoolcomp.cpp +++ b/indra/newview/lltoolcomp.cpp @@ -742,12 +742,13 @@ BOOL LLToolCompGun::handleHover(S32 x, S32 y, MASK mask) BOOL LLToolCompGun::handleMouseDown(S32 x, S32 y, MASK mask) { - // if the left button is grabbed, don't put up the pie menu - if (gAgent.leftButtonGrabbed()) - { - gAgent.setControlFlags(AGENT_CONTROL_ML_LBUTTON_DOWN); - return FALSE; - } + // if the left button is blocked, don't put up the pie menu + if (gAgent.leftButtonBlocked()) + { + // in case of "grabbed" control flag will be set later + gAgent.setControlFlags(AGENT_CONTROL_ML_LBUTTON_DOWN); + return FALSE; + } // On mousedown, start grabbing gGrabTransientTool = this; @@ -759,12 +760,13 @@ BOOL LLToolCompGun::handleMouseDown(S32 x, S32 y, MASK mask) BOOL LLToolCompGun::handleDoubleClick(S32 x, S32 y, MASK mask) { - // if the left button is grabbed, don't put up the pie menu - if (gAgent.leftButtonGrabbed()) - { - gAgent.setControlFlags(AGENT_CONTROL_ML_LBUTTON_DOWN); - return FALSE; - } + // if the left button is blocked, don't put up the pie menu + if (gAgent.leftButtonBlocked()) + { + // in case of "grabbed" control flag will be set later + gAgent.setControlFlags(AGENT_CONTROL_ML_LBUTTON_DOWN); + return FALSE; + } // On mousedown, start grabbing gGrabTransientTool = this; |