diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-04-06 10:19:15 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-04-06 10:19:15 -0400 |
| commit | 785d4c34b62b7ca76b292e0001c516ba8fa738bc (patch) | |
| tree | 2aa2b03daa6aa399bf77cfc36fd525ff1c6d7a45 /indra/newview/lltooldraganddrop.cpp | |
| parent | 7bfa3e81e726569519e3f214c5091bf65516b7f5 (diff) | |
EXT-4151 : Immediately check if a fetchObserver filter is done, else add to observer list automatically
Preliminary work to clean up naming conventions.
Diffstat (limited to 'indra/newview/lltooldraganddrop.cpp')
| -rw-r--r-- | indra/newview/lltooldraganddrop.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp index c977377f3a..1e81e675e6 100644 --- a/indra/newview/lltooldraganddrop.cpp +++ b/indra/newview/lltooldraganddrop.cpp @@ -306,8 +306,8 @@ void LLCategoryDropDescendentsObserver::done() { gInventory.removeObserver(this); - uuid_vec_t::iterator it = mCompleteFolders.begin(); - uuid_vec_t::iterator end = mCompleteFolders.end(); + uuid_vec_t::iterator it = mComplete.begin(); + uuid_vec_t::iterator end = mComplete.end(); LLViewerInventoryCategory::cat_array_t cats; LLViewerInventoryItem::item_array_t items; for(; it != end; ++it) @@ -332,7 +332,7 @@ void LLCategoryDropDescendentsObserver::done() std::copy(unique_ids.begin(), unique_ids.end(), copier); LLCategoryDropObserver* dropper; dropper = new LLCategoryDropObserver(mObjectID, mSource); - dropper->fetchItems(ids); + dropper->fetch(ids); if (dropper->isEverythingComplete()) { dropper->done(); @@ -2577,7 +2577,7 @@ EAcceptance LLToolDragAndDrop::dad3dUpdateInventoryCategory( ids.push_back(item->getUUID()); } LLCategoryDropObserver* dropper = new LLCategoryDropObserver(obj->getID(), mSource); - dropper->fetchItems(ids); + dropper->fetch(ids); if (dropper->isEverythingComplete()) { dropper->done(); |