diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-20 20:48:16 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-20 20:48:16 -0500 |
| commit | 4f3953763de478b15ec6adc5c468b19a0e13bfe8 (patch) | |
| tree | df9926a8ef0446a44bbb07126dafb7345760fd8c /indra/newview/llinventoryfunctions.cpp | |
| parent | f9b9c7a5816cf0b9627a4a50e73a663667937145 (diff) | |
| parent | c47ab36b20e102a918257e5fa5452f13bc55a393 (diff) | |
merge changes from viewer-beta
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; } |