diff options
author | Oz Linden <oz@lindenlab.com> | 2014-10-13 17:13:15 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2014-10-13 17:13:15 -0400 |
commit | 852426d71e5b192a003d01d128799c2b702c69b1 (patch) | |
tree | 66a31f735c3dd92f557a9026cf359ef000d548e9 /indra/newview/llinventoryfunctions.cpp | |
parent | 08a4d7a27743792a644c46f8163d973d0524cd79 (diff) | |
parent | 788ce7a8cdbbbf98566ce75ec281ec00c21dc6d8 (diff) |
merge changes for 3.7.17-release
Diffstat (limited to 'indra/newview/llinventoryfunctions.cpp')
-rwxr-xr-x | indra/newview/llinventoryfunctions.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index 1e7825a13e..1abc09bf3b 100755 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -881,7 +881,7 @@ bool LLFindWearablesEx::operator()(LLInventoryCategory* cat, LLInventoryItem* it if (!vitem) return false; // Skip non-wearables. - if (!vitem->isWearableType() && vitem->getType() != LLAssetType::AT_OBJECT) + if (!vitem->isWearableType() && vitem->getType() != LLAssetType::AT_OBJECT && vitem->getType() != LLAssetType::AT_GESTURE) { return false; } |