livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CHUI-746 : Fixed! Undid the MAINT-2276 hack now that submenus do work thanks to CHUI-682

master
Merov Linden 2013-02-08 20:51:02 -08:00
parent 3016afcd06
commit 2e2026a4f8
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llpaneloutfitedit.cpp
View File

@ -186,11 +186,8 @@ private:
// Populate the menu with items like "New Skin", "New Pants", etc.
static void populateCreateWearableSubmenus(LLMenuGL* menu)
{
// MAINT-2276...these menus are created as dummies because they are not available
// when this function is called. This prevents their parent from popping up later.
//
//LLView* menu_clothes = gMenuHolder->getChildView("COF.Gear.New_Clothes", FALSE);
//LLView* menu_bp = gMenuHolder->getChildView("COF.Geear.New_Body_Parts", FALSE);
LLView* menu_clothes = gMenuHolder->getChildView("COF.Gear.New_Clothes", FALSE);
LLView* menu_bp = gMenuHolder->getChildView("COF.Gear.New_Body_Parts", FALSE);
for (U8 i = LLWearableType::WT_SHAPE; i != (U8) LLWearableType::WT_COUNT; ++i)
{
@ -203,11 +200,7 @@ private:
p.on_click.function_name = "Wearable.Create";
p.on_click.parameter = LLSD(type_name);
//LLView* parent = LLWearableType::getAssetType(type) == LLAssetType::AT_CLOTHING ? menu_clothes : menu_bp;
// This is a work-around for MAINT-2276 wherein the parent toggleable menu does not appear
// It puts everything under one menu, but that menu appears, which is better than not.
//
LLView* parent = menu;
LLView* parent = LLWearableType::getAssetType(type) == LLAssetType::AT_CLOTHING ? menu_clothes : menu_bp;
LLUICtrlFactory::create<LLMenuItemCallGL>(p, parent);
}
}

2
indra/newview/skins/default/xui/en/menu_cof_gear.xml
View File

@ -9,5 +9,5 @@
<menu
label="New Body Parts"
layout="topleft"
name="COF.Geear.New_Body_Parts" />
name="COF.Gear.New_Body_Parts" />
</toggleable_menu>