diff options
| author | Andrew Dyukov <adyukov@productengine.com> | 2010-06-24 18:00:09 +0300 |
|---|---|---|
| committer | Andrew Dyukov <adyukov@productengine.com> | 2010-06-24 18:00:09 +0300 |
| commit | a209e339ee96095e884e4de51ea5c88e51825d62 (patch) | |
| tree | 80f1cc0542605d89db6e90caca9d67bc96dbecaa /indra/newview/llpaneloutfitsinventory.cpp | |
| parent | cb801fafb2cce28d2eecd87f011bc50eae686f1b (diff) | |
EXT-7793 FIXED Implemented wearing separate wearables instead of whole outfit when individual items are selected in list.
- Added wearSelectedItems() method to LLOutfitsList which wears all items selected in outfit lists (if possible- adds, else replaces).
It is called when clicking wear if there is selection of individual items(LLOutfitsList::hasItemSelected() returns true). Otherwise
whole outfit is worn.
Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/638
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llpaneloutfitsinventory.cpp')
| -rw-r--r-- | indra/newview/llpaneloutfitsinventory.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llpaneloutfitsinventory.cpp b/indra/newview/llpaneloutfitsinventory.cpp index 2f1cad8a75..076e6485a8 100644 --- a/indra/newview/llpaneloutfitsinventory.cpp +++ b/indra/newview/llpaneloutfitsinventory.cpp @@ -169,7 +169,14 @@ void LLPanelOutfitsInventory::onSearchEdit(const std::string& string) void LLPanelOutfitsInventory::onWearButtonClick() { - mMyOutfitsPanel->performAction("replaceoutfit"); + if (mMyOutfitsPanel->hasItemSelected()) + { + mMyOutfitsPanel->wearSelectedItems(); + } + else + { + mMyOutfitsPanel->performAction("replaceoutfit"); + } } bool LLPanelOutfitsInventory::onSaveCommit(const LLSD& notification, const LLSD& response) |