summaryrefslogtreecommitdiff
path: root/indra/newview/llappearancemgr.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2010-07-22 11:11:22 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2010-07-22 11:11:22 -0400
commit35837f2d382120088572ec87006238c79973e493 (patch)
tree16784998d08eddaba06499e7ace8adcda73436a8 /indra/newview/llappearancemgr.cpp
parent87ae9a5190f1b8562c886ba0f36efbd6bd9925aa (diff)
EXT-8153 FIX - modified replace logic when wearing multiple items
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
-rw-r--r--indra/newview/llappearancemgr.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index d6ac6e1e5e..5e0d49ac12 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -2731,10 +2731,14 @@ void wear_multiple(const uuid_vec_t& ids, bool replace)
{
LLPointer<LLInventoryCallback> cb = new LLUpdateAppearanceOnDestroy;
+ bool first = true;
uuid_vec_t::const_iterator it;
for (it = ids.begin(); it != ids.end(); ++it)
{
- LLAppearanceMgr::instance().wearItemOnAvatar(*it,false,replace,cb);
+ // if replace is requested, the first item worn will replace the current top
+ // item, and others will be added.
+ LLAppearanceMgr::instance().wearItemOnAvatar(*it,false,first && replace,cb);
+ first = false;
}
}