diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-01-30 20:01:03 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-01-30 20:01:03 -0800 |
| commit | faae38daaaf30fd96b217316cf3eafb095ff35bc (patch) | |
| tree | e73c2991dcfffa2c4d4260fff6102d65be1e1312 /indra/llui/llmenugl.h | |
| parent | 6af899f19e246c7fe4faa1edcdfbcfe9f01dbd25 (diff) | |
| parent | e7c0f69c8e0509d822c6f7410bc0d5bb10fde522 (diff) | |
Pull merge from lindenlab/viewer-developement
Diffstat (limited to 'indra/llui/llmenugl.h')
| -rw-r--r-- | indra/llui/llmenugl.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h index c57e0f0267..51df5df1f8 100644 --- a/indra/llui/llmenugl.h +++ b/indra/llui/llmenugl.h @@ -716,20 +716,25 @@ public: LLContextMenuBranch(const Params&); - // Called to rebuild strings for this item + virtual ~LLContextMenuBranch() + {} + + // called to rebuild the draw label virtual void buildDrawLabel( void ); - // Performed when menu item clicked + // onCommit() - do the primary funcationality of the menu item. virtual void onCommit( void ); LLContextMenu* getBranch() { return mBranch.get(); } void setHighlight( BOOL highlight ); protected: - void showSubMenu(); + void showSubMenu(); + LLHandle<LLContextMenu> mBranch; }; + //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Class LLMenuBarGL // |