diff options
author | Loren Shih <seraph@lindenlab.com> | 2011-01-13 10:28:15 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2011-01-13 10:28:15 -0500 |
commit | 584c7ecb4ed02e9ab039c6254ffc33331c31058c (patch) | |
tree | 19e34f57dc625da58f03e4eb659b721e38f072a7 /indra/newview/llinventoryfunctions.cpp | |
parent | e7f068c37ef18315a11f1054bfd095b3420025aa (diff) | |
parent | 55322713fc071a3e171fd4cfbea989945dc8d084 (diff) |
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/llinventoryfunctions.cpp')
-rw-r--r-- | indra/newview/llinventoryfunctions.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index 1b07aa279b..342d15cf0f 100644 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -686,6 +686,12 @@ bool LLFindWearablesEx::operator()(LLInventoryCategory* cat, LLInventoryItem* it return false; } + // Skip broken links. + if (vitem->getIsBrokenLink()) + { + return false; + } + return (bool) get_is_item_worn(item->getUUID()) == mIsWorn; } |