From e7a8acadc46c4466f088dfca05c15f854321d69d Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Sat, 12 Jan 2008 00:43:42 +0000 Subject: svn merge -r76807:77355 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release Pick up fixes made to 1.18.6 Viewer, including: * DEV-8584 Replace "Second Life" with Channel name in viewer crash log reports * DEV-8384 Connect button doesn't enable * DEV-8408 Unable to edit First/last name and password fields in viewer login * DEV-8423 VWR-3948: Underlayers no longer removable by pie menu in Windlight, release candidates * DEV-8557 Crash on login page when using Logitech LCD Keyboard * DEV-8507 Crash reporter has no default server to send to when crashing before agent connect * DEV-8531 viewer_manifest.py broken for 64-bit builds * DEV-8286 German Translation of the "Release Keys" tab is incorrect * DEV-7419 Unable to set 'Group Access' for land that is also 'Public Access' (Was VWR-3667) * DEV-6851 Integrate html error page with client --- indra/newview/llviewermenu.cpp | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) (limited to 'indra/newview/llviewermenu.cpp') diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 4c7229b0d9..ab82fef6cc 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -607,6 +607,21 @@ void initialize_menus(); // // Break up groups of more than 6 items with separators //----------------------------------------------------------------------------- + +void set_underclothes_menu_options() +{ + if (gMenuHolder && gAgent.isTeen()) + { + gMenuHolder->getChildByName("Self Underpants", TRUE)->setVisible(FALSE); + gMenuHolder->getChildByName("Self Undershirt", TRUE)->setVisible(FALSE); + } + if (gMenuBarView && gAgent.isTeen()) + { + gMenuBarView->getChildByName("Menu Underpants", TRUE)->setVisible(FALSE); + gMenuBarView->getChildByName("Menu Undershirt", TRUE)->setVisible(FALSE); + } +} + void init_menus() { S32 top = gViewerWindow->getRootView()->getRect().getHeight(); @@ -643,12 +658,6 @@ void init_menus() gDetachScreenPieMenu = (LLPieMenu*)gMenuHolder->getChildByName("Object Detach HUD", true); gDetachPieMenu = (LLPieMenu*)gMenuHolder->getChildByName("Object Detach", true); - if (gAgent.isTeen()) - { - gMenuHolder->getChildByName("Self Underpants", TRUE)->setVisible(FALSE); - gMenuHolder->getChildByName("Self Undershirt", TRUE)->setVisible(FALSE); - } - gPieAvatar = gUICtrlFactory->buildPieMenu("menu_pie_avatar.xml", gMenuHolder); gPieObject = gUICtrlFactory->buildPieMenu("menu_pie_object.xml", gMenuHolder); @@ -710,12 +719,6 @@ void init_menus() gAttachSubMenu = gMenuBarView->getChildMenuByName("Attach Object", TRUE); gDetachSubMenu = gMenuBarView->getChildMenuByName("Detach Object", TRUE); - if (gAgent.isTeen()) - { - gMenuBarView->getChildByName("Menu Underpants", TRUE)->setVisible(FALSE); - gMenuBarView->getChildByName("Menu Undershirt", TRUE)->setVisible(FALSE); - } - // TomY TODO convert these two LLMenuGL*menu; @@ -763,6 +766,8 @@ void init_menus() } + + void init_landmark_menu(LLMenuGL* menu) { if (!menu) return; -- cgit v1.2.3