diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-09-15 23:22:58 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-09-15 23:22:58 +0300 |
| commit | 8c5e92a399dde318b08549dc3ab7fe20152ab336 (patch) | |
| tree | a4593b2b022ca53bdb0946d9d73d6b24355e8aaf | |
| parent | c2b6620572056d4de372ccd77602c39afd2500c6 (diff) | |
| parent | 3c8cc4d2ac4dbcbae6bc56ccb222a043d6616341 (diff) | |
Merged in pavelkproductengine/visual-outfit-browser
| -rw-r--r-- | indra/newview/llappearancemgr.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/lloutfitgallery.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index d6c33206b1..252e2f5dec 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -1875,15 +1875,15 @@ bool LLAppearanceMgr::getCanReplaceCOF(const LLUUID& outfit_cat_id) return false; } - // Check whether the outfit contains any wearables we aren't wearing already (STORM-702). + // Check whether the outfit contains any wearables LLInventoryModel::cat_array_t cats; LLInventoryModel::item_array_t items; - LLFindWearablesEx is_worn(/*is_worn=*/ false, /*include_body_parts=*/ true); + LLFindWearables is_wearable; gInventory.collectDescendentsIf(outfit_cat_id, cats, items, LLInventoryModel::EXCLUDE_TRASH, - is_worn); + is_wearable); return items.size() > 0; } diff --git a/indra/newview/lloutfitgallery.cpp b/indra/newview/lloutfitgallery.cpp index 65fd3f95ab..de6a36ce2f 100644 --- a/indra/newview/lloutfitgallery.cpp +++ b/indra/newview/lloutfitgallery.cpp @@ -999,7 +999,7 @@ void LLOutfitGallery::refreshOutfit(const LLUUID& category_id) } } - if (mGalleryCreated) + if (mGalleryCreated && !LLApp::isQuitting()) { reArrangeRows(); } |