diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-07-20 10:44:27 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-07-20 10:44:27 -0400 |
| commit | ca1224fd7968edebfcd274c21439ca74340efc26 (patch) | |
| tree | 3589b61799fe369e030a22c217dee7ecd7530874 /indra/newview/lloutfitobserver.cpp | |
| parent | 22232ccf050e34841c248ea29fed8f64b8abab6b (diff) | |
EXT-8360 FIX - item name changes get propagated to the various appearance panel widgets
Diffstat (limited to 'indra/newview/lloutfitobserver.cpp')
| -rw-r--r-- | indra/newview/lloutfitobserver.cpp | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/indra/newview/lloutfitobserver.cpp b/indra/newview/lloutfitobserver.cpp index 99835edad2..60c941b456 100644 --- a/indra/newview/lloutfitobserver.cpp +++ b/indra/newview/lloutfitobserver.cpp @@ -89,12 +89,11 @@ bool LLOutfitObserver::checkCOF() return false; bool cof_changed = false; - LLMD5 itemNameHash; - hashItemNames(itemNameHash); - if (itemNameHash != mItemNameHash) + LLMD5 item_name_hash = gInventory.hashDirectDescendentNames(cof); + if (item_name_hash != mItemNameHash) { cof_changed = true; - mItemNameHash = itemNameHash; + mItemNameHash = item_name_hash; } S32 cof_version = getCategoryVersion(cof); @@ -114,27 +113,6 @@ bool LLOutfitObserver::checkCOF() return true; } -void LLOutfitObserver::hashItemNames(LLMD5& itemNameHash) -{ - LLInventoryModel::cat_array_t cat_array; - LLInventoryModel::item_array_t item_array; - gInventory.collectDescendents(LLAppearanceMgr::instance().getCOF(), - cat_array, - item_array, - false); - for (LLInventoryModel::item_array_t::const_iterator iter = item_array.begin(); - iter != item_array.end(); - iter++) - { - const LLViewerInventoryItem *item = (*iter); - if (!item) - continue; - const std::string& name = item->getName(); - itemNameHash.update(name); - } - itemNameHash.finalize(); -} - void LLOutfitObserver::checkBaseOutfit() { LLUUID baseoutfit_id = |