diff options
| author | prep linden <prep@lindenlab.com> | 2011-01-14 15:30:57 -0500 |
|---|---|---|
| committer | prep linden <prep@lindenlab.com> | 2011-01-14 15:30:57 -0500 |
| commit | eec6071766e6fef7015610b002a9bcb09ce36836 (patch) | |
| tree | 4f63bb1629b5295a1de10d1a014b5297a6cf34cc /indra/llui/llmenugl.cpp | |
| parent | a678ff80af6c48d4232c52aa505b633a1fc22663 (diff) | |
| parent | 645da31dd70834dd67a854b3775529154e538d7f (diff) | |
merge
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); |