diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-21 15:55:55 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-21 15:55:55 -0500 |
| commit | d034d8d9289a9e5511d32ec048b75837b89264ad (patch) | |
| tree | c3fd25eb7d1096baef0290b5bf86321f7ed447ad /indra/llui/llmenugl.cpp | |
| parent | 6150e4ed7cf86a2afc0061ba89b0cb049d6f036e (diff) | |
| parent | 97a9211d87fac90994846e5bf91a78a708ec5a9c (diff) | |
merge changes for vwr-24347
Diffstat (limited to 'indra/llui/llmenugl.cpp')
| -rw-r--r-- | indra/llui/llmenugl.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index 6c0d47ef63..32d7be377a 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -1637,6 +1637,10 @@ LLMenuScrollItem::LLMenuScrollItem(const Params& p) } LLButton::Params bparams; + + // Disabled the Return key handling by LLMenuScrollItem instead of + // passing the key press to the currently selected menu item. See STORM-385. + bparams.commit_on_return(false); bparams.mouse_opaque(true); bparams.scale_image(false); bparams.click_callback(p.scroll_callback); |