diff options
author | Josh Bell <josh@lindenlab.com> | 2007-01-15 18:49:02 +0000 |
---|---|---|
committer | Josh Bell <josh@lindenlab.com> | 2007-01-15 18:49:02 +0000 |
commit | aeb6d0c93c1122c1320f99c1a652a5e2f1d60d52 (patch) | |
tree | 5aedb2a22e54d9c2c2fe9389d4ad6cebe891c5f1 /indra/llui/llmenugl.h | |
parent | dbf45ad4294a59c050982b5a417fe86272026454 (diff) |
svn merge -r 56599:56738 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
Diffstat (limited to 'indra/llui/llmenugl.h')
-rw-r--r-- | indra/llui/llmenugl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h index 0dca8f2550..c15f417e65 100644 --- a/indra/llui/llmenugl.h +++ b/indra/llui/llmenugl.h @@ -410,7 +410,7 @@ public: virtual void drawBackground(LLMenuItemGL* itemp, LLColor4& color); virtual void setVisible(BOOL visible); - virtual BOOL LLMenuGL::handleAcceleratorKey(KEY key, MASK mask); + virtual BOOL handleAcceleratorKey(KEY key, MASK mask); LLMenuGL* getChildMenuByName(const LLString& name, BOOL recurse) const; |