summaryrefslogtreecommitdiff
path: root/indra/newview/llappearancemgr.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2015-10-12 15:24:56 -0400
committerOz Linden <oz@lindenlab.com>2015-10-12 15:24:56 -0400
commitd17614ca6121dde0ec917664796f263045ad5b6c (patch)
tree79535b8ab5cfb38302aaa46dc0531ea5a67da9aa /indra/newview/llappearancemgr.cpp
parent22e3e8461cf5a36754369c2648b1b4cd252a4d5c (diff)
parent4312629e7c5749b86add9d42e6e550602f34dbf5 (diff)
merge changes for 3.8.5-release
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
-rwxr-xr-xindra/newview/llappearancemgr.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 35593dd4ff..142a3250c8 100755
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -1869,6 +1869,10 @@ bool LLAppearanceMgr::canAddWearables(const uuid_vec_t& item_ids)
{
++n_clothes;
}
+ else if (item->getType() == LLAssetType::AT_BODYPART)
+ {
+ return isAgentAvatarValid();
+ }
else
{
LL_WARNS() << "Unexpected wearable type" << LL_ENDL;