diff options
| author | Steven Harrison (steven) <steven@lindenlab.com> | 2019-05-17 16:49:58 +0000 |
|---|---|---|
| committer | Steven Harrison (steven) <steven@lindenlab.com> | 2019-05-17 16:49:58 +0000 |
| commit | 771e6344fe5852f9d67df7476e6658d2d3facd73 (patch) | |
| tree | 80401553637251e6fd598a72f95a0d38f02db859 /indra/newview/llappearancemgr.cpp | |
| parent | 59c93cb861a3cc5ef766ec27f82e7c82fe17f54b (diff) | |
| parent | e31f4a352d2dfdcc4ccb1be459382054e354f085 (diff) | |
Pull from viewer-bear and merge
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
| -rw-r--r-- | indra/newview/llappearancemgr.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 08daeb0f59..22bcbad7da 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -1865,7 +1865,6 @@ bool LLAppearanceMgr::getCanRemoveOutfit(const LLUUID& outfit_cat_id) LLFindNonRemovableObjects filter_non_removable; LLInventoryModel::cat_array_t cats; LLInventoryModel::item_array_t items; - LLInventoryModel::item_array_t::const_iterator it; gInventory.collectDescendentsIf(outfit_cat_id, cats, items, false, filter_non_removable); if (!cats.empty() || !items.empty()) { |