diff options
author | Oz Linden <oz@lindenlab.com> | 2011-01-21 15:29:40 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-01-21 15:29:40 -0500 |
commit | 790dfe7556a476b502ef3a0ea921efdd11735f28 (patch) | |
tree | 3db004c2acdfcf32f01abbf284e6dbd67c61a4c8 /indra/newview/llinventoryfunctions.cpp | |
parent | 6a3d06deca73683514d4668f78adf684d760708c (diff) | |
parent | 4652e26196ed43e3a2fdd5bbb2e6c4b6b8466719 (diff) |
merge changes for storm-844
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; } |