diff options
| author | Joshua Bell <josh@lindenlab.com> | 2011-01-13 12:16:54 -0800 |
|---|---|---|
| committer | Joshua Bell <josh@lindenlab.com> | 2011-01-13 12:16:54 -0800 |
| commit | dee9c80862ed54138889de8095087dda340ac073 (patch) | |
| tree | 4c947e89be49cf6cafafc95b9f1b6634c57339f2 /indra/llui/llmenugl.cpp | |
| parent | 20b983afe0d7f66a1db036c60e4c53b6141eb0cd (diff) | |
| parent | 756a4e26da6cec82d48a71d05b1f43623b56313d (diff) | |
merged
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); |