diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-10-13 09:49:57 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-10-13 09:49:57 -0400 |
| commit | 90c26759ef5fe1f35bcda82f444e647d07c28fc6 (patch) | |
| tree | 5f0d669d275be58fa7543cb1a826b3036c031c13 /indra/newview/llappearancemgr.cpp | |
| parent | 4d81570d62bc9d746565083ef18fdc16c198a5dc (diff) | |
| parent | 4312629e7c5749b86add9d42e6e550602f34dbf5 (diff) | |
merge changes for 3.8.5-release
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
| -rwxr-xr-x | indra/newview/llappearancemgr.cpp | 4 |
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; |