diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-06-24 18:01:32 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-06-24 18:01:32 -0400 |
commit | 84f1f65af045746cfa73c7efd68ce960ac47cdf2 (patch) | |
tree | d04acf2262c9298ba64149c0eb5ec3342a95c4ad /indra/llui/llmenugl.cpp | |
parent | 632860484556e156bbe021a4f2d3411899837216 (diff) | |
parent | 63b3bf29208d51df84f10594266661d6294df4c6 (diff) |
merge
Diffstat (limited to 'indra/llui/llmenugl.cpp')
-rw-r--r-- | indra/llui/llmenugl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index b77126996e..b4a1bcb7c5 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -139,6 +139,7 @@ LLMenuItemGL::Params::Params() : shortcut("shortcut"), jump_key("jump_key", KEY_NONE), use_mac_ctrl("use_mac_ctrl", false), + allow_key_repeat("allow_key_repeat", false), rect("rect"), left("left"), top("top"), @@ -160,7 +161,7 @@ LLMenuItemGL::Params::Params() LLMenuItemGL::LLMenuItemGL(const LLMenuItemGL::Params& p) : LLUICtrl(p), mJumpKey(p.jump_key), - mAllowKeyRepeat(FALSE), + mAllowKeyRepeat(p.allow_key_repeat), mHighlight( FALSE ), mGotHover( FALSE ), mBriefItem( FALSE ), |