diff options
author | Jacek Antonelli | 2008-08-15 23:44:49 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:44:49 -0500 |
commit | c659c65d02d4d92b614ccdf2e2a4a0dcf859a8cd (patch) | |
tree | 49f225d319b111f30f113c4cf7728565afa52132 /linden/indra/newview/llviewermenu.cpp | |
parent | Second Life viewer sources 1.13.2.15 (diff) | |
download | meta-impy-c659c65d02d4d92b614ccdf2e2a4a0dcf859a8cd.zip meta-impy-c659c65d02d4d92b614ccdf2e2a4a0dcf859a8cd.tar.gz meta-impy-c659c65d02d4d92b614ccdf2e2a4a0dcf859a8cd.tar.bz2 meta-impy-c659c65d02d4d92b614ccdf2e2a4a0dcf859a8cd.tar.xz |
Second Life viewer sources 1.13.3.2
Diffstat (limited to 'linden/indra/newview/llviewermenu.cpp')
-rw-r--r-- | linden/indra/newview/llviewermenu.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp index 3e5063e..ab400de 100644 --- a/linden/indra/newview/llviewermenu.cpp +++ b/linden/indra/newview/llviewermenu.cpp | |||
@@ -581,21 +581,21 @@ void init_menus() | |||
581 | // flash when an item is triggered (the flash occurs in the holder) | 581 | // flash when an item is triggered (the flash occurs in the holder) |
582 | gViewerWindow->getRootView()->addChild(gMenuHolder); | 582 | gViewerWindow->getRootView()->addChild(gMenuHolder); |
583 | 583 | ||
584 | gMenuHolder->childSetLabelArg("Upload Image", "[COST]", "10"); | 584 | gMenuHolder->childSetLabelArg("Upload Image", "[COST]", "10"); |
585 | gMenuHolder->childSetLabelArg("Upload Sound", "[COST]", "10"); | 585 | gMenuHolder->childSetLabelArg("Upload Sound", "[COST]", "10"); |
586 | gMenuHolder->childSetLabelArg("Upload Animation", "[COST]", "10"); | 586 | gMenuHolder->childSetLabelArg("Upload Animation", "[COST]", "10"); |
587 | gMenuHolder->childSetLabelArg("Bulk Upload", "[COST]", "10"); | 587 | gMenuHolder->childSetLabelArg("Bulk Upload", "[COST]", "10"); |
588 | 588 | ||
589 | gAFKMenu = (LLMenuItemCallGL*)gMenuBarView->getChildByName("Set Away", TRUE); | 589 | gAFKMenu = (LLMenuItemCallGL*)gMenuBarView->getChildByName("Set Away", TRUE); |
590 | gBusyMenu = (LLMenuItemCallGL*)gMenuBarView->getChildByName("Set Busy", TRUE); | 590 | gBusyMenu = (LLMenuItemCallGL*)gMenuBarView->getChildByName("Set Busy", TRUE); |
591 | gAttachSubMenu = gMenuBarView->getChildMenuByName("Attach Object", TRUE); | 591 | gAttachSubMenu = gMenuBarView->getChildMenuByName("Attach Object", TRUE); |
592 | gDetachSubMenu = gMenuBarView->getChildMenuByName("Detach Object", TRUE); | 592 | gDetachSubMenu = gMenuBarView->getChildMenuByName("Detach Object", TRUE); |
593 | 593 | ||
594 | if (gAgent.mAccess < SIM_ACCESS_MATURE) | 594 | if (gAgent.mAccess < SIM_ACCESS_MATURE) |
595 | { | 595 | { |
596 | gMenuBarView->getChildByName("Menu Underpants", TRUE)->setVisible(FALSE); | 596 | gMenuBarView->getChildByName("Menu Underpants", TRUE)->setVisible(FALSE); |
597 | gMenuBarView->getChildByName("Menu Undershirt", TRUE)->setVisible(FALSE); | 597 | gMenuBarView->getChildByName("Menu Undershirt", TRUE)->setVisible(FALSE); |
598 | } | 598 | } |
599 | 599 | ||
600 | // TomY TODO convert these two | 600 | // TomY TODO convert these two |
601 | LLMenuGL*menu; | 601 | LLMenuGL*menu; |
@@ -626,23 +626,23 @@ void init_menus() | |||
626 | /// | 626 | /// |
627 | gPieSelf = gUICtrlFactory->buildPieMenu("menu_pie_self.xml", gMenuHolder); | 627 | gPieSelf = gUICtrlFactory->buildPieMenu("menu_pie_self.xml", gMenuHolder); |
628 | 628 | ||
629 | // TomY TODO: what shall we do about these? | 629 | // TomY TODO: what shall we do about these? |
630 | gDetachScreenPieMenu = (LLPieMenu*)gMenuHolder->getChildByName("Object Detach HUD", true); | 630 | gDetachScreenPieMenu = (LLPieMenu*)gMenuHolder->getChildByName("Object Detach HUD", true); |
631 | gDetachPieMenu = (LLPieMenu*)gMenuHolder->getChildByName("Object Detach", true); | 631 | gDetachPieMenu = (LLPieMenu*)gMenuHolder->getChildByName("Object Detach", true); |
632 | 632 | ||
633 | if (gAgent.mAccess < SIM_ACCESS_MATURE) | 633 | if (gAgent.mAccess < SIM_ACCESS_MATURE) |
634 | { | 634 | { |
635 | gMenuHolder->getChildByName("Self Underpants", TRUE)->setVisible(FALSE); | 635 | gMenuHolder->getChildByName("Self Underpants", TRUE)->setVisible(FALSE); |
636 | gMenuHolder->getChildByName("Self Undershirt", TRUE)->setVisible(FALSE); | 636 | gMenuHolder->getChildByName("Self Undershirt", TRUE)->setVisible(FALSE); |
637 | } | 637 | } |
638 | 638 | ||
639 | gPieAvatar = gUICtrlFactory->buildPieMenu("menu_pie_avatar.xml", gMenuHolder); | 639 | gPieAvatar = gUICtrlFactory->buildPieMenu("menu_pie_avatar.xml", gMenuHolder); |
640 | 640 | ||
641 | gPieObject = gUICtrlFactory->buildPieMenu("menu_pie_object.xml", gMenuHolder); | 641 | gPieObject = gUICtrlFactory->buildPieMenu("menu_pie_object.xml", gMenuHolder); |
642 | 642 | ||
643 | gAttachScreenPieMenu = (LLPieMenu*)gMenuHolder->getChildByName("Object Attach HUD", true); | 643 | gAttachScreenPieMenu = (LLPieMenu*)gMenuHolder->getChildByName("Object Attach HUD", true); |
644 | gAttachPieMenu = (LLPieMenu*)gMenuHolder->getChildByName("Object Attach", true); | 644 | gAttachPieMenu = (LLPieMenu*)gMenuHolder->getChildByName("Object Attach", true); |
645 | gPieRate = (LLPieMenu*)gMenuHolder->getChildByName("Rate Menu", true); | 645 | gPieRate = (LLPieMenu*)gMenuHolder->getChildByName("Rate Menu", true); |
646 | 646 | ||
647 | gPieAttachment = gUICtrlFactory->buildPieMenu("menu_pie_attachment.xml", gMenuHolder); | 647 | gPieAttachment = gUICtrlFactory->buildPieMenu("menu_pie_attachment.xml", gMenuHolder); |
648 | 648 | ||