diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-17 10:30:36 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-17 10:30:36 -0500 |
| commit | 74fdba829574e5132fec6633b0ddcd2feb9fe51e (patch) | |
| tree | bf17dba56b38a3b228f6174f950e3d405b6329af /indra/llui/llmenugl.cpp | |
| parent | fe28f89e7e79b9de5a455b9c9833d243d8039774 (diff) | |
| parent | 1d7b46e2c32c6bdf2e6cf5a8b9dcb0c8cb767b1b (diff) | |
merge changes for vwr-24420
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); |