diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-21 15:29:40 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-21 15:29:40 -0500 |
| commit | 790dfe7556a476b502ef3a0ea921efdd11735f28 (patch) | |
| tree | 3db004c2acdfcf32f01abbf284e6dbd67c61a4c8 /indra/llui/llmenugl.cpp | |
| parent | 6a3d06deca73683514d4668f78adf684d760708c (diff) | |
| parent | 4652e26196ed43e3a2fdd5bbb2e6c4b6b8466719 (diff) | |
merge changes for storm-844
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); |