diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-24 14:22:08 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-24 14:22:08 -0500 |
| commit | de83bd5c6b1e103993ba74321d600f1c413785ce (patch) | |
| tree | 7a93bec47e33227541abda9ea80b7b094c8be549 /indra/newview/llinventoryfunctions.cpp | |
| parent | f57aa3e83f1b4286b1d6b5cc8bca20fb924cb002 (diff) | |
| parent | 295536ae98cb88bfa551ac73ae2e19a8c2ddfc88 (diff) | |
merge changes for beta fixes
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; } |