diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-11-28 17:09:34 +0200 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-11-28 17:09:34 +0200 |
| commit | fd77a8001593183953ac24488593d997aee6bc28 (patch) | |
| tree | 65cd4c9f4941a4fac52c1f37ff5d11d440fd21a4 | |
| parent | 7f1cb755fef2b16a6c05fd20db4af8feea136017 (diff) | |
SL-6109 Fixed issue with llcontrols ignoring left mouse button with masks
| -rw-r--r-- | indra/llcommon/llkeybind.cpp | 4 | ||||
| -rw-r--r-- | indra/llcommon/llkeybind.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/llkeybind.cpp b/indra/llcommon/llkeybind.cpp index ecfc289cb3..38696c2258 100644 --- a/indra/llcommon/llkeybind.cpp +++ b/indra/llcommon/llkeybind.cpp @@ -144,7 +144,7 @@ bool LLKeyData::canHandle(const LLKeyData& data) const { if (data.mKey == mKey && data.mMouse == mMouse - && ((mIgnoreMasks && (data.mMask & mMask) == data.mMask) || data.mMask == mMask)) + && ((mIgnoreMasks && (data.mMask & mMask) == mMask) || data.mMask == mMask)) { return true; } @@ -155,7 +155,7 @@ bool LLKeyData::canHandle(EMouseClickType mouse, KEY key, MASK mask) const { if (mouse == mMouse && key == mKey - && ((mIgnoreMasks && (mask & mMask) == mask) || mask == mMask)) + && ((mIgnoreMasks && (mask & mMask) == mMask) || mask == mMask)) { return true; } diff --git a/indra/llcommon/llkeybind.h b/indra/llcommon/llkeybind.h index ad0ebec67c..7dc2aff4cb 100644 --- a/indra/llcommon/llkeybind.h +++ b/indra/llcommon/llkeybind.h @@ -53,7 +53,7 @@ public: EMouseClickType mMouse; KEY mKey; MASK mMask; - // Either to expect exact match or ignore not expected masks + // Either to expect exact match or to make sure mMask is inclused and ignore not expected masks bool mIgnoreMasks; }; |