diff options
| author | Simon Linden <simon@lindenlab.com> | 2013-03-19 16:20:53 -0700 |
|---|---|---|
| committer | Simon Linden <simon@lindenlab.com> | 2013-03-19 16:20:53 -0700 |
| commit | d5561a1ada5cf171c8e281e910a7e989496c3705 (patch) | |
| tree | 456cbb2374242d5508cc13165c876cd0672f6cd0 /indra/newview/llviewermenu.h | |
| parent | a8245c51b9cd6fac1d26932dbb1fcf052f00da18 (diff) | |
| parent | 04e78ce4fdd3bbc0e4daa1daabbff2de1c425601 (diff) | |
Merge in viewer-beta to get CHUI code
Diffstat (limited to 'indra/newview/llviewermenu.h')
| -rw-r--r-- | indra/newview/llviewermenu.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llviewermenu.h b/indra/newview/llviewermenu.h index 87d679f54f..42c2d469b2 100644 --- a/indra/newview/llviewermenu.h +++ b/indra/newview/llviewermenu.h @@ -27,7 +27,7 @@ #ifndef LL_LLVIEWERMENU_H #define LL_LLVIEWERMENU_H -#include "llmenugl.h" +#include "../llui/llmenugl.h" #include "llsafehandle.h" class LLMessageSystem; @@ -185,8 +185,6 @@ extern LLContextMenu* gDetachPieMenu; extern LLContextMenu* gAttachBodyPartPieMenus[8]; extern LLContextMenu* gDetachBodyPartPieMenus[8]; -extern LLMenuItemCallGL* gAFKMenu; -extern LLMenuItemCallGL* gBusyMenu; extern LLMenuItemCallGL* gMutePieMenu; extern LLMenuItemCallGL* gMuteObjectPieMenu; extern LLMenuItemCallGL* gBuyPassPieMenu; |