Skip to content
Snippets Groups Projects
Commit 2676f516 authored by Graham Madarasz (Graham)'s avatar Graham Madarasz (Graham)
Browse files

For MAINT-2276 a workaround to unblock 3.4.5 beta review: ted

parent cc15a08a
No related branches found
No related tags found
No related merge requests found
...@@ -186,8 +186,11 @@ private: ...@@ -186,8 +186,11 @@ private:
// Populate the menu with items like "New Skin", "New Pants", etc. // Populate the menu with items like "New Skin", "New Pants", etc.
static void populateCreateWearableSubmenus(LLMenuGL* menu) static void populateCreateWearableSubmenus(LLMenuGL* menu)
{ {
LLView* menu_clothes = gMenuHolder->getChildView("COF.Gear.New_Clothes", FALSE); // MAINT-2276...these menus are created as dummies because they are not available
LLView* menu_bp = gMenuHolder->getChildView("COF.Geear.New_Body_Parts", FALSE); // 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);
for (U8 i = LLWearableType::WT_SHAPE; i != (U8) LLWearableType::WT_COUNT; ++i) for (U8 i = LLWearableType::WT_SHAPE; i != (U8) LLWearableType::WT_COUNT; ++i)
{ {
...@@ -200,8 +203,11 @@ private: ...@@ -200,8 +203,11 @@ private:
p.on_click.function_name = "Wearable.Create"; p.on_click.function_name = "Wearable.Create";
p.on_click.parameter = LLSD(type_name); p.on_click.parameter = LLSD(type_name);
LLView* parent = LLWearableType::getAssetType(type) == LLAssetType::AT_CLOTHING ? //LLView* parent = LLWearableType::getAssetType(type) == LLAssetType::AT_CLOTHING ? menu_clothes : menu_bp;
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;
LLUICtrlFactory::create<LLMenuItemCallGL>(p, parent); LLUICtrlFactory::create<LLMenuItemCallGL>(p, parent);
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment