diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-12-18 10:16:26 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-12-18 10:16:26 -0800 |
| commit | 6dd80980cfa5be214c143d125cfabd006ea7ebff (patch) | |
| tree | 102a4d2c7cddeec35feaf18e71cfb8f598001868 /indra/llui/llview.h | |
| parent | 2af14639de9f575ac9a2766835206e5c6ffb46c8 (diff) | |
| parent | 7b993d15b70d419dc0a7c8d92286d34a2635537d (diff) | |
Merge
Diffstat (limited to 'indra/llui/llview.h')
| -rwxr-xr-x | indra/llui/llview.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llui/llview.h b/indra/llui/llview.h index 7861c8f729..8494bb338a 100755 --- a/indra/llui/llview.h +++ b/indra/llui/llview.h @@ -378,6 +378,7 @@ public: // inherited from LLFocusableElement /* virtual */ BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent); + /* virtual */ BOOL handleKeyUp(KEY key, MASK mask, BOOL called_from_parent); /* virtual */ BOOL handleUnicodeChar(llwchar uni_char, BOOL called_from_parent); virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, @@ -509,6 +510,7 @@ public: //virtual BOOL addChildFromParam(const LLInitParam::BaseBlock& params) { return TRUE; } virtual BOOL handleKeyHere(KEY key, MASK mask); + virtual BOOL handleKeyUpHere(KEY key, MASK mask); virtual BOOL handleUnicodeCharHere(llwchar uni_char); virtual void handleReshape(const LLRect& rect, bool by_user); @@ -538,6 +540,7 @@ protected: void logMouseEvent(); LLView* childrenHandleKey(KEY key, MASK mask); + LLView* childrenHandleKeyUp(KEY key, MASK mask); LLView* childrenHandleUnicodeChar(llwchar uni_char); LLView* childrenHandleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, |