diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-21 07:23:48 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-21 07:23:48 -0500 |
| commit | bb3be2c07f492577254ae9ace5675eb92d10f061 (patch) | |
| tree | 038a59de9284c528bf5c51d1dab851f23ecbc444 /indra/newview/llinventoryfunctions.cpp | |
| parent | e3e1d9b4c3446ea87d1938d1cb0c4a5a9e5d448d (diff) | |
| parent | bca2b9a053b1358435b57e0c7a59866702644844 (diff) | |
merge changes for storm-715
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 ef20869114..61d0a150b7 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; } |