diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-01-12 11:09:46 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-01-12 11:09:46 -0800 |
| commit | 76b7bc1a4bdc105798b6e580915530e47c46ac78 (patch) | |
| tree | 1f8f9bc1cf57c6c9a1bcd41d2e96fd735095f6dd /indra | |
| parent | e3fb72f547ce61b1cfb0da7a280b31c2e78d57b6 (diff) | |
| parent | b48c003d60ad1358ade39bd321bb901afda24ee6 (diff) | |
STORM-385 : pull in viewer-development
Diffstat (limited to 'indra')
| -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); |