diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-06-24 19:37:35 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-06-24 19:37:35 -0400 |
| commit | c77efc92e3ebcb9af9bb997e5b709484153844d4 (patch) | |
| tree | 57f58946a62b16dc623d7469d59bef19f514d574 /indra/llui/llmenugl.cpp | |
| parent | 9f835b9bce6ac023a9f8b98cfb53015f5d416130 (diff) | |
| parent | c6b80b47459711cc4c0b1971cb954ad6148517a0 (diff) | |
automated 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 ), |