diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-01 07:22:32 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-01 07:22:32 -0500 |
| commit | f0074f1002f36ad680ae04daf3f5e026dca31d54 (patch) | |
| tree | e55cad847d3dbd156b8386272d0778bdf952c33a /indra/newview/llinventoryfunctions.cpp | |
| parent | 1aa01ad67fbe15ed43d8bb0bc7fb34a076a484b0 (diff) | |
| parent | ed308d15bf2f88f91687411cd92f6cc55b1e75b4 (diff) | |
merge changes back from beta branch
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; } |