diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-01-29 19:22:00 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-01-29 19:22:00 -0500 |
| commit | d331592fc76d97ee391dd2aeb9a5e6aa018a5b2c (patch) | |
| tree | c08a562ec27cce76ca216699933138498cb749b7 | |
| parent | dae5c6294af0b133419b0b40dfc971aae37329c1 (diff) | |
| parent | bfbf4a6c46be52e64147e0be4a4bdc4a81392cd7 (diff) | |
merge changes for MAINT-2276
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | indra/newview/llpaneloutfitedit.cpp | 14 |
2 files changed, 11 insertions, 4 deletions
@@ -412,3 +412,4 @@ ccf991e02dc2f63fb646324230d54832683f4a9b DRTVWR-286 e06898df8644fe567bee94f817d03abc1c380993 3.4.5-beta3 a676b4d6c037b39fe5b8e42cf8839a9303936089 DRTVWR-289 28fa8b944a0c1869636ab00cc400f5aa71f6fa3c DRTVWR-290 +7f09bbc28c297f14b67961be7b6575445fa160e8 DRTVWR-291 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<LLMenuItemCallGL>(p, parent); } } |