diff options
| author | Andrew Meadows <andrew@lindenlab.com> | 2011-01-07 15:22:22 -0800 |
|---|---|---|
| committer | Andrew Meadows <andrew@lindenlab.com> | 2011-01-07 15:22:22 -0800 |
| commit | d23f7df822b6c0557f9426b5e1aa660b77aba01e (patch) | |
| tree | 2e86e4ec60018beabd35a54cc18fdf322a504269 /indra/newview/llpaneloutfitedit.cpp | |
| parent | cf64ecb41dbbdcdc3c512510c4a7ebd28c832314 (diff) | |
| parent | c132d20a7433e2d09e3521a15497f661fcbd18b8 (diff) | |
merge
Diffstat (limited to 'indra/newview/llpaneloutfitedit.cpp')
| -rw-r--r-- | indra/newview/llpaneloutfitedit.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp index ce9b1c66d7..c10c21683b 100644 --- a/indra/newview/llpaneloutfitedit.cpp +++ b/indra/newview/llpaneloutfitedit.cpp @@ -186,14 +186,8 @@ private: // Populate the menu with items like "New Skin", "New Pants", etc. static void populateCreateWearableSubmenus(LLMenuGL* menu) { - LLView* menu_clothes = gMenuHolder->findChildView("COF.Gear.New_Clothes", FALSE); - LLView* menu_bp = gMenuHolder->findChildView("COF.Geear.New_Body_Parts", FALSE); - - if (!menu_clothes || !menu_bp) - { - llassert(menu_clothes && menu_bp); - return; - } + 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) { |