diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-19 05:53:20 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-19 05:57:01 +0200 |
| commit | 0dd4577013a48289f84dcb3cc8b673fb1f733b7d (patch) | |
| tree | 4a05bf549e15624e9023fa0887a583d0f3d73537 /indra/newview | |
| parent | 49dd88e86c8e5939fbd82d5a5316c36ade262ca2 (diff) | |
DRTVWR-540 Post-merge build fix
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewerinput.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerinput.cpp b/indra/newview/llviewerinput.cpp index c900d0f6bf..e76b8c0fcf 100644 --- a/indra/newview/llviewerinput.cpp +++ b/indra/newview/llviewerinput.cpp @@ -1255,7 +1255,7 @@ BOOL LLViewerInput::bindMouse(const S32 mode, const EMouseClickType mouse, const return TRUE; } - function_t* result = LLKeyboardActionRegistry::getValue(function_name); + LLKeybindFunctionData* result = LLKeyboardActionRegistry::getValue(function_name); if (result) { function = result->mFunction; @@ -1666,7 +1666,7 @@ bool LLViewerInput::scanMouse(EMouseClickType click, EMouseState state) const bool res = false; S32 mode = getMode(); MASK mask = gKeyboard->currentMask(TRUE); - res = scanMouse(mMouseBindings[mode], mMouseBindings[mode].size(), click, mask, state); + res = scanMouse(mMouseBindings[mode], mMouseBindings[mode].size(), click, mask, state, false); // No user defined actions found or those actions can't handle the key/button, // so handle CONTROL_LBUTTON if nessesary. |