aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewermenu.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-02-25 01:09:07 -0700
committerMcCabe Maxsted2009-02-25 01:09:07 -0700
commitfdf4d97d4d9ce64eee4142e491509106be5b716b (patch)
tree18ea2f2bf7a312de623635326872996355a411ec /linden/indra/newview/llviewermenu.cpp
parentChanged the show/hide shortcuts to be linux friendly (diff)
downloadmeta-impy-fdf4d97d4d9ce64eee4142e491509106be5b716b.zip
meta-impy-fdf4d97d4d9ce64eee4142e491509106be5b716b.tar.gz
meta-impy-fdf4d97d4d9ce64eee4142e491509106be5b716b.tar.bz2
meta-impy-fdf4d97d4d9ce64eee4142e491509106be5b716b.tar.xz
Added menu_pie_hud.xml, removed legacy rate pie menu references
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llviewermenu.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index b7f4a40..31fdcc3 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -251,6 +251,7 @@ LLPieMenu *gPieSelf = NULL;
251LLPieMenu *gPieAvatar = NULL; 251LLPieMenu *gPieAvatar = NULL;
252LLPieMenu *gPieObject = NULL; 252LLPieMenu *gPieObject = NULL;
253LLPieMenu *gPieAttachment = NULL; 253LLPieMenu *gPieAttachment = NULL;
254LLPieMenu *gPieHUD = NULL;
254LLPieMenu *gPieLand = NULL; 255LLPieMenu *gPieLand = NULL;
255 256
256// local constants 257// local constants
@@ -263,7 +264,6 @@ const std::string SAVE_INTO_TASK_INVENTORY("Save Object Back to Object Contents"
263LLMenuGL* gAttachSubMenu = NULL; 264LLMenuGL* gAttachSubMenu = NULL;
264LLMenuGL* gDetachSubMenu = NULL; 265LLMenuGL* gDetachSubMenu = NULL;
265LLMenuGL* gTakeOffClothes = NULL; 266LLMenuGL* gTakeOffClothes = NULL;
266LLPieMenu* gPieRate = NULL;
267LLPieMenu* gAttachScreenPieMenu = NULL; 267LLPieMenu* gAttachScreenPieMenu = NULL;
268LLPieMenu* gAttachPieMenu = NULL; 268LLPieMenu* gAttachPieMenu = NULL;
269LLPieMenu* gAttachBodyPartPieMenus[8]; 269LLPieMenu* gAttachBodyPartPieMenus[8];
@@ -610,10 +610,11 @@ void init_menus()
610 610
611 gAttachScreenPieMenu = gMenuHolder->getChild<LLPieMenu>("Object Attach HUD"); 611 gAttachScreenPieMenu = gMenuHolder->getChild<LLPieMenu>("Object Attach HUD");
612 gAttachPieMenu = gMenuHolder->getChild<LLPieMenu>("Object Attach"); 612 gAttachPieMenu = gMenuHolder->getChild<LLPieMenu>("Object Attach");
613 gPieRate = gMenuHolder->getChild<LLPieMenu>("Rate Menu");
614 613
615 gPieAttachment = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_attachment.xml", gMenuHolder); 614 gPieAttachment = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_attachment.xml", gMenuHolder);
616 615
616 gPieHUD = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_hud.xml", gMenuHolder);
617
617 gPieLand = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_land.xml", gMenuHolder); 618 gPieLand = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_land.xml", gMenuHolder);
618 619
619 /// 620 ///
@@ -626,6 +627,7 @@ void init_menus()
626 gPieAvatar->setBackgroundColor( pie_color ); 627 gPieAvatar->setBackgroundColor( pie_color );
627 gPieObject->setBackgroundColor( pie_color ); 628 gPieObject->setBackgroundColor( pie_color );
628 gPieAttachment->setBackgroundColor( pie_color ); 629 gPieAttachment->setBackgroundColor( pie_color );
630 gPieHUD->setBackgroundColor( pie_color );
629 gPieLand->setBackgroundColor( pie_color ); 631 gPieLand->setBackgroundColor( pie_color );
630 632
631 color = gColors.getColor( "MenuPopupBgColor" ); 633 color = gColors.getColor( "MenuPopupBgColor" );
@@ -1475,6 +1477,9 @@ void cleanup_menus()
1475 delete gPieAttachment; 1477 delete gPieAttachment;
1476 gPieAttachment = NULL; 1478 gPieAttachment = NULL;
1477 1479
1480 delete gPieHUD;
1481 gPieHUD = NULL;
1482
1478 delete gPieLand; 1483 delete gPieLand;
1479 gPieLand = NULL; 1484 gPieLand = NULL;
1480 1485