diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2015-12-22 17:59:01 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2015-12-22 17:59:01 +0200 |
| commit | b095e2c985680660d61a99e8dbac78d9113b9870 (patch) | |
| tree | 171d31162fcb58f05c440de7ae383c7a88819a43 /indra/llui/llview.h | |
| parent | 49fa9b5515e708083c85aaa2b1b522bc266944c4 (diff) | |
| parent | 60dfd55edaa5df0cb864dc5086037bc5625bc0be (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, |