diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-20 20:48:16 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-20 20:48:16 -0500 |
| commit | 4f3953763de478b15ec6adc5c468b19a0e13bfe8 (patch) | |
| tree | df9926a8ef0446a44bbb07126dafb7345760fd8c /indra/llui/llmenugl.cpp | |
| parent | f9b9c7a5816cf0b9627a4a50e73a663667937145 (diff) | |
| parent | c47ab36b20e102a918257e5fa5452f13bc55a393 (diff) | |
merge changes from viewer-beta
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); |