summaryrefslogtreecommitdiff
path: root/indra/llui/llmenugl.h
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-06-24 19:37:35 -0400
committerLoren Shih <seraph@lindenlab.com>2010-06-24 19:37:35 -0400
commitc77efc92e3ebcb9af9bb997e5b709484153844d4 (patch)
tree57f58946a62b16dc623d7469d59bef19f514d574 /indra/llui/llmenugl.h
parent9f835b9bce6ac023a9f8b98cfb53015f5d416130 (diff)
parentc6b80b47459711cc4c0b1971cb954ad6148517a0 (diff)
automated merge
Diffstat (limited to 'indra/llui/llmenugl.h')
-rw-r--r--indra/llui/llmenugl.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h
index 6f0f83d4b9..7668f301ea 100644
--- a/indra/llui/llmenugl.h
+++ b/indra/llui/llmenugl.h
@@ -61,7 +61,8 @@ public:
{
Optional<std::string> shortcut;
Optional<KEY> jump_key;
- Optional<bool> use_mac_ctrl;
+ Optional<bool> use_mac_ctrl,
+ allow_key_repeat;
Ignored rect,
left,