diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-09-22 18:51:19 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-09-22 18:51:19 -0400 |
| commit | 620817c1c3368d73f1b47b1593a0bcbcf567e297 (patch) | |
| tree | e37b76dc8d154ab661ab23e6be2b6b098f97e4b2 /indra/newview/llinventoryfunctions.cpp | |
| parent | 329608d24668b044e16b54ff7a7d0ac592b2b88d (diff) | |
| parent | 8897e7ca24533e0093825346391f5fa9a37f2427 (diff) | |
Merge. Refresh from viewer-drano-http-4 after release of 3.7.16.
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; } |