summaryrefslogtreecommitdiff
path: root/indra/newview/llpaneloutfitsinventory.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-06-24 22:12:03 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-06-24 22:12:03 +0100
commit46ca04e939a13bb4d73777aa66e609a7c0d56e40 (patch)
tree2e65369de912511fa6cf3e8728c4382db6fde11a /indra/newview/llpaneloutfitsinventory.cpp
parentbe731a31de18b10c6d2cf8cfd4187a34fbe117fd (diff)
parent4671dd6575c22f57d32fb8871d5c313fbb2b7a76 (diff)
merge from PE's viewer-release
Diffstat (limited to 'indra/newview/llpaneloutfitsinventory.cpp')
-rw-r--r--indra/newview/llpaneloutfitsinventory.cpp9
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)