From 863e380fb61121c977a6101b47accdb813c328af Mon Sep 17 00:00:00 2001 From: Vadim Savchuk Date: Tue, 10 Aug 2010 22:38:29 +0300 Subject: EXT-8576 FIXED Only attachments are worn if multi-select items on 'My Outfits' tab and press 'Wear' button. Reason: avatar appearance was not updated if the last selected item was an attachment. Fix: make sure appearance is updated afterwards, regardless of items types. Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/848/ --HG-- branch : product-engine --- indra/newview/lloutfitslist.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/lloutfitslist.cpp b/indra/newview/lloutfitslist.cpp index f921bca623..2b6c80bac8 100644 --- a/indra/newview/lloutfitslist.cpp +++ b/indra/newview/lloutfitslist.cpp @@ -1038,14 +1038,7 @@ void LLOutfitsList::wearSelectedItems() return; } - uuid_vec_t::const_iterator it; - // Wear items from all selected lists(if possible- add, else replace) - for (it = selected_uuids.begin(); it != selected_uuids.end()-1; ++it) - { - LLAppearanceMgr::getInstance()->wearItemOnAvatar(*it, false, false); - } - // call update only when wearing last item - LLAppearanceMgr::getInstance()->wearItemOnAvatar(*it, true, false); + wear_multiple(selected_uuids, false); } void LLOutfitsList::onWearableItemsListRightClick(LLUICtrl* ctrl, S32 x, S32 y) -- cgit v1.2.3 From f5ae33fa5373d7fd6b59f4d3688575a58bc69bff Mon Sep 17 00:00:00 2001 From: Eli Linden Date: Tue, 10 Aug 2010 15:24:16 -0700 Subject: CT-575 WIP restore PL translation that got lost --- indra/newview/skins/default/xui/pl/panel_login.xml | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/xui/pl/panel_login.xml b/indra/newview/skins/default/xui/pl/panel_login.xml index 7447efe667..5e4955c28c 100644 --- a/indra/newview/skins/default/xui/pl/panel_login.xml +++ b/indra/newview/skins/default/xui/pl/panel_login.xml @@ -12,19 +12,27 @@ Użytkownik: + + Hasło: +