diff options
author | Oz Linden <oz@lindenlab.com> | 2014-10-21 09:16:56 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2014-10-21 09:16:56 -0400 |
commit | 4c8e526b99cb717e9086dec87a94b56fecad8984 (patch) | |
tree | 45294c593721be9bc8def1563b07438554dfa08b /indra/llui/llscrolllistctrl.cpp | |
parent | d3387faca57c560279a6b8b83711a789b84f0ecd (diff) | |
parent | a0a61ff61e6cf38ccbd0d0a9eecb10d532feaf55 (diff) |
merge changes for callum fixes and workarounds
Diffstat (limited to 'indra/llui/llscrolllistctrl.cpp')
-rwxr-xr-x | indra/llui/llscrolllistctrl.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp index 5f72ee3ac6..cf8be57908 100755 --- a/indra/llui/llscrolllistctrl.cpp +++ b/indra/llui/llscrolllistctrl.cpp @@ -2095,9 +2095,6 @@ BOOL LLScrollListCtrl::handleKeyHere(KEY key,MASK mask ) // not called from parent means we have keyboard focus or a child does if (mCanSelect) { - // Ignore capslock - mask = mask; - if (mask == MASK_NONE) { switch(key) |