From 2676f516f28cce1f8cd76aaffeb234c1a61043fb Mon Sep 17 00:00:00 2001 From: "Graham Madarasz (Graham)" Date: Mon, 28 Jan 2013 10:15:10 -0800 Subject: For MAINT-2276 a workaround to unblock 3.4.5 beta review: ted --- indra/newview/llpaneloutfitedit.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp index 35e2e96bab..36234b9536 100644 --- a/indra/newview/llpaneloutfitedit.cpp +++ b/indra/newview/llpaneloutfitedit.cpp @@ -186,8 +186,11 @@ private: // Populate the menu with items like "New Skin", "New Pants", etc. static void populateCreateWearableSubmenus(LLMenuGL* menu) { - LLView* menu_clothes = gMenuHolder->getChildView("COF.Gear.New_Clothes", FALSE); - LLView* menu_bp = gMenuHolder->getChildView("COF.Geear.New_Body_Parts", FALSE); + // 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); for (U8 i = LLWearableType::WT_SHAPE; i != (U8) LLWearableType::WT_COUNT; ++i) { @@ -200,8 +203,11 @@ 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; + //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; LLUICtrlFactory::create(p, parent); } } -- cgit v1.2.3 From bfbf4a6c46be52e64147e0be4a4bdc4a81392cd7 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 29 Jan 2013 14:12:55 -0500 Subject: Added tag DRTVWR-291 for changeset 7f09bbc28c29 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index afe117d3f6..be03ca6932 100644 --- a/.hgtags +++ b/.hgtags @@ -410,3 +410,4 @@ ccf991e02dc2f63fb646324230d54832683f4a9b DRTVWR-286 e06898df8644fe567bee94f817d03abc1c380993 3.4.5-beta3 a676b4d6c037b39fe5b8e42cf8839a9303936089 DRTVWR-289 28fa8b944a0c1869636ab00cc400f5aa71f6fa3c DRTVWR-290 +7f09bbc28c297f14b67961be7b6575445fa160e8 DRTVWR-291 -- cgit v1.2.3