diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-07-27 10:24:53 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-07-27 10:24:53 -0400 |
| commit | a3328658725dd12efbb1a9107e4c6f0612772c12 (patch) | |
| tree | cc9707083f3cef32a92a481ffbae5b0a7ef92630 /indra/llui/llmenugl.cpp | |
| parent | 34ab18d0c2f7de57e42ded0c3d94ee0fec17da28 (diff) | |
| parent | d55264bf13520fc7adab347565ee13cc30fc8656 (diff) | |
automated merge
Diffstat (limited to 'indra/llui/llmenugl.cpp')
| -rw-r--r-- | indra/llui/llmenugl.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index b4a1bcb7c5..8610d79142 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -218,6 +218,12 @@ void LLMenuItemGL::setValue(const LLSD& value) } //virtual +LLSD LLMenuItemGL::getValue() const +{ + return getLabel(); +} + +//virtual BOOL LLMenuItemGL::handleAcceleratorKey(KEY key, MASK mask) { if( getEnabled() && (!gKeyboard->getKeyRepeated(key) || mAllowKeyRepeat) && (key == mAcceleratorKey) && (mask == (mAcceleratorMask & MASK_NORMALKEYS)) ) |