diff options
author | Rider Linden <rider@lindenlab.com> | 2015-10-19 12:03:08 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2015-10-19 12:03:08 -0700 |
commit | 53b947e0397d6b88fdc6c0a10144e5a6d02a67d3 (patch) | |
tree | 38c94f216386ba6653e8152d9db0198807f4f2cc /indra/newview/llappearancemgr.cpp | |
parent | ed7963bad14abd628fa60d0d5baf357f1858c48c (diff) | |
parent | 4312629e7c5749b86add9d42e6e550602f34dbf5 (diff) |
Merge from viewer 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 025009d40b..d080dfb66e 100755 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -1887,6 +1887,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; |