From 35837f2d382120088572ec87006238c79973e493 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Thu, 22 Jul 2010 11:11:22 -0400 Subject: EXT-8153 FIX - modified replace logic when wearing multiple items --- indra/newview/llappearancemgr.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'indra/newview/llappearancemgr.cpp') 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 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; } } -- cgit v1.2.3