diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2015-12-22 11:07:18 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2015-12-22 11:07:18 +0200 |
| commit | 60dfd55edaa5df0cb864dc5086037bc5625bc0be (patch) | |
| tree | 7140d0f8eddc02e7ee71fa03fc9aa4aa652cd476 /indra/newview/llmediactrl.h | |
| parent | 6e6d610a9905c1bceb9dd073c3eed87574fdcb29 (diff) | |
| parent | 7b993d15b70d419dc0a7c8d92286d34a2635537d (diff) | |
Merge downstream, version 4.0.1
Diffstat (limited to 'indra/newview/llmediactrl.h')
| -rwxr-xr-x | indra/newview/llmediactrl.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llmediactrl.h b/indra/newview/llmediactrl.h index 988733b85a..291d87073e 100755 --- a/indra/newview/llmediactrl.h +++ b/indra/newview/llmediactrl.h @@ -151,6 +151,7 @@ public: // over-rides virtual BOOL handleKeyHere( KEY key, MASK mask); + virtual BOOL handleKeyUpHere(KEY key, MASK mask); virtual void onVisibilityChange ( BOOL new_visibility ); virtual BOOL handleUnicodeCharHere(llwchar uni_char); virtual void reshape( S32 width, S32 height, BOOL called_from_parent = TRUE); @@ -171,6 +172,10 @@ public: void updateContextMenuParent(LLView* pNewParent); + // The Browser windows want keyup and keydown events. Overridden from LLFocusableElement to return true. + virtual bool wantsKeyUpKeyDown() const; + virtual bool wantsReturnKey() const; + protected: void convertInputCoords(S32& x, S32& y); |