diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-31 12:32:57 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-31 12:32:57 -0500 |
| commit | cb6d59513eabe72029821a96191873351fd5c753 (patch) | |
| tree | ed311d11da22ab8d1aff695166d0ca38d269ccae /indra/newview/llinventoryfunctions.cpp | |
| parent | d0b5e6b0b4acebd1b11685dea290b830957ba9dc (diff) | |
| parent | bbb4fb10a50495669ec5d49da4a39950a5e2042d (diff) | |
merge changes for storm-829
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; } |