diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-06 16:10:16 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-06 16:10:16 +0100 |
| commit | 1dade05ee77d01f88544984735d638542b42c1d1 (patch) | |
| tree | 51e87c809698563876cc6ee508462654c1868a56 /indra/newview/llappearancemgr.h | |
| parent | 54c39177e58b9c189b96774d6ae3143d31559da0 (diff) | |
| parent | ec5bd9c857b4d817685b09f9a10da7434ebbb816 (diff) | |
YET another hairy merge from viewer-trunk. Conflicts resolved... so far.
Diffstat (limited to 'indra/newview/llappearancemgr.h')
| -rw-r--r-- | indra/newview/llappearancemgr.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h index 423d9bde69..40b8844731 100644 --- a/indra/newview/llappearancemgr.h +++ b/indra/newview/llappearancemgr.h @@ -282,14 +282,14 @@ public: // happen. LLInventoryModel::cat_array_t cat_array; LLInventoryModel::item_array_t item_array; - gInventory.collectDescendents(mCompleteFolders.front(), + gInventory.collectDescendents(mComplete.front(), cat_array, item_array, LLInventoryModel::EXCLUDE_TRASH); S32 count = item_array.count(); if(!count) { - llwarns << "Nothing fetched in category " << mCompleteFolders.front() + llwarns << "Nothing fetched in category " << mComplete.front() << llendl; //dec_busy_count(); gInventory.removeObserver(this); @@ -307,7 +307,7 @@ public: gInventory.removeObserver(this); // do the fetch - stage2->fetchItems(ids); + stage2->fetch(ids); if(stage2->isEverythingComplete()) { // everything is already here - call done. @@ -331,7 +331,7 @@ void callAfterCategoryFetch(const LLUUID& cat_id, T callable) CallAfterCategoryFetchStage1<T> *stage1 = new CallAfterCategoryFetchStage1<T>(callable); uuid_vec_t folders; folders.push_back(cat_id); - stage1->fetchDescendents(folders); + stage1->fetch(folders); if (stage1->isEverythingComplete()) { stage1->done(); |