diff options
author | Dessie Linden <dessie@lindenlab.com> | 2010-06-25 12:39:46 -0700 |
---|---|---|
committer | Dessie Linden <dessie@lindenlab.com> | 2010-06-25 12:39:46 -0700 |
commit | 3240b188e958fa6232ddb03bc29adb968c7521ac (patch) | |
tree | 2ee6663288dd21f03444a435addbb1925dd389e6 /indra/newview/llpaneloutfitsinventory.cpp | |
parent | 89ff83d2e7aa6f5af27c3e235b467e5fcd2937a4 (diff) | |
parent | 62cd50fe1edd67308cf0a2e5407bd4005e705681 (diff) |
Merged from viewer-release
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) |