diff options
author | nat-goodspeed <nat@lindenlab.com> | 2024-10-24 12:21:13 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-10-24 12:21:13 -0400 |
commit | b611324db58def7d65f4bfc721e7dc1c378b7fa3 (patch) | |
tree | 22074ffb1c262b9ffbb458a2836405e5c086ce7d /indra/llcommon/llkeybind.cpp | |
parent | 299c37adaec5cf33981cbbaa3c25c68152b14725 (diff) | |
parent | 168a5f36b92f5cbc3d83248fb5ffbb47a3b7e223 (diff) |
Merge pull request #2585 from secondlife/marchcat/xcode-16
Xcode16 build fix
Diffstat (limited to 'indra/llcommon/llkeybind.cpp')
-rw-r--r-- | indra/llcommon/llkeybind.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/indra/llcommon/llkeybind.cpp b/indra/llcommon/llkeybind.cpp index 83c53d220d..73a207504e 100644 --- a/indra/llcommon/llkeybind.cpp +++ b/indra/llcommon/llkeybind.cpp @@ -125,20 +125,16 @@ LLKeyData& LLKeyData::operator=(const LLKeyData& rhs) bool LLKeyData::operator==(const LLKeyData& rhs) const { - if (mMouse != rhs.mMouse) return false; - if (mKey != rhs.mKey) return false; - if (mMask != rhs.mMask) return false; - if (mIgnoreMasks != rhs.mIgnoreMasks) return false; - return true; + return + (mMouse == rhs.mMouse) && + (mKey == rhs.mKey) && + (mMask == rhs.mMask) && + (mIgnoreMasks == rhs.mIgnoreMasks); } bool LLKeyData::operator!=(const LLKeyData& rhs) const { - if (mMouse != rhs.mMouse) return true; - if (mKey != rhs.mKey) return true; - if (mMask != rhs.mMask) return true; - if (mIgnoreMasks != rhs.mIgnoreMasks) return true; - return false; + return ! (*this == rhs); } bool LLKeyData::canHandle(const LLKeyData& data) const |