diff options
| author | James Cook <james@lindenlab.com> | 2009-12-09 16:37:08 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-09 16:37:08 -0800 |
| commit | dab87201cd37e27d72a0e233ccfbdf3697457190 (patch) | |
| tree | 48826dd4afca001338ce7b51ca8d961e609629c7 /indra/newview/llviewermenu.h | |
| parent | 418f30d1cdd5cc37fced19ca0a4c45f17ee84a90 (diff) | |
Partial EXT-3268 Object Profile option showing up in avatar 3D Context menu
Renamed gPie* and menu_pie_* to just gMenu* and menu_* because they are no
longer pie menus. Created separate other-attachment menus.
Reviewed with Richard.
Diffstat (limited to 'indra/newview/llviewermenu.h')
| -rw-r--r-- | indra/newview/llviewermenu.h | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/indra/newview/llviewermenu.h b/indra/newview/llviewermenu.h index 01a6b34170..71be4cb592 100644 --- a/indra/newview/llviewermenu.h +++ b/indra/newview/llviewermenu.h @@ -160,21 +160,13 @@ extern LLMenuGL* gPopupMenuView; extern LLViewerMenuHolderGL* gMenuHolder; extern LLMenuBarGL* gLoginMenuBarView; -// Pie menus -extern LLContextMenu *gPieSelf; -extern LLContextMenu *gPieAvatar; -extern LLContextMenu *gPieObject; -extern LLContextMenu *gPieAttachment; - -extern LLContextMenu *gPieLand; -extern LLContextMenu *gPieRate; - -// Pie menus -extern LLContextMenu *gPieSelfSimple; -extern LLContextMenu *gPieAvatarSimple; -extern LLContextMenu *gPieObjectSimple; -extern LLContextMenu *gPieAttachmentSimple; -extern LLContextMenu *gPieLandSimple; +// Context menus in 3D scene +extern LLContextMenu *gMenuAvatarSelf; +extern LLContextMenu *gMenuAvatarOther; +extern LLContextMenu *gMenuObject; +extern LLContextMenu *gMenuAttachmentSelf; +extern LLContextMenu *gMenuAttachmentOther; +extern LLContextMenu *gMenuLand; // Needed to build menus when attachment site list available extern LLMenuGL* gAttachSubMenu; |