diff options
| author | leyla_linden <none@none> | 2011-01-19 11:39:25 -0800 |
|---|---|---|
| committer | leyla_linden <none@none> | 2011-01-19 11:39:25 -0800 |
| commit | 17068766b75fbe7dac968705f4f383fb61f73eb4 (patch) | |
| tree | 9a6923653b721311b61edac947b2e7682972cce3 /indra/llui/llmenugl.cpp | |
| parent | ca1c1eea78ff2ab83979a4308dd5a93ea0032fc8 (diff) | |
| parent | eec6071766e6fef7015610b002a9bcb09ce36836 (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); |