diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-21 07:23:48 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-21 07:23:48 -0500 |
| commit | bb3be2c07f492577254ae9ace5675eb92d10f061 (patch) | |
| tree | 038a59de9284c528bf5c51d1dab851f23ecbc444 /indra/llui/llmenugl.cpp | |
| parent | e3e1d9b4c3446ea87d1938d1cb0c4a5a9e5d448d (diff) | |
| parent | bca2b9a053b1358435b57e0c7a59866702644844 (diff) | |
merge changes for storm-715
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); |