Merge from default branch

--HG--
branch : product-engine

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;
 	}
 }