summaryrefslogtreecommitdiff
path: root/indra/llui/llmenugl.cpp
diff options
context:
space:
mode:
authorSeth ProductEngine <slitovchuk@productengine.com>2011-01-06 22:19:27 +0200
committerSeth ProductEngine <slitovchuk@productengine.com>2011-01-06 22:19:27 +0200
commitb48c003d60ad1358ade39bd321bb901afda24ee6 (patch)
treeb5529ca04c9f4bfb1352529157de77775cdfdad2 /indra/llui/llmenugl.cpp
parent1034db639462d95e54e9bf9e4d63500b745bb0a2 (diff)
STORM-387 FIXED Return key handling by Favorites bar overflow menu.
Pressing Return in Favorites bar overflow menu now acts as mouse double click, i.e. performs teleport to selected landmark.
Diffstat (limited to 'indra/llui/llmenugl.cpp')
-rw-r--r--indra/llui/llmenugl.cpp4
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);