Merge remote-tracking branch 'origin/develop-linux' into geenz/linux-to-develop

1 files changed, 0 insertions, 9 deletions

diff --git a/indra/llcommon/llkeybind.cpp b/indra/llcommon/llkeybind.cpp
index e36c1d0a4c..abb0df0b87 100644
--- a/indra/llcommon/llkeybind.cpp
+++ b/indra/llcommon/llkeybind.cpp
@@ -114,15 +114,6 @@ void LLKeyData::reset()
     mIgnoreMasks = false;
 }
 
-LLKeyData& LLKeyData::operator=(const LLKeyData& rhs)
-{
-    mMouse = rhs.mMouse;
-    mKey = rhs.mKey;
-    mMask = rhs.mMask;
-    mIgnoreMasks = rhs.mIgnoreMasks;
-    return *this;
-}
-
 bool LLKeyData::operator==(const LLKeyData& rhs)
 {
     if (mMouse != rhs.mMouse) return false;