diff options
| author | mberezhnoy <mberezhnoy@productengine.com> | 2013-02-01 01:00:52 +0200 |
|---|---|---|
| committer | mberezhnoy <mberezhnoy@productengine.com> | 2013-02-01 01:00:52 +0200 |
| commit | 8fbc0aada88c6a3743f61dfc57018385a31802f0 (patch) | |
| tree | 56888fe7f24736cce1980e08d349d20f84b814ed /indra/llui/llmenugl.h | |
| parent | a12200b91b0ca20dfff2df8aa71c6f53ac0603ee (diff) | |
| parent | d2a17e20ca889851406f22907df35b17f5030279 (diff) | |
merging
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 // |