summaryrefslogtreecommitdiff
path: root/indra/newview/llfriendcard.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-04-06 17:30:23 -0400
committerLoren Shih <seraph@lindenlab.com>2010-04-06 17:30:23 -0400
commitc3d9316dff568d5265d856a708e3909deae09f18 (patch)
treec05e3fb3229f15b71b83483a52f52f00156ecbd3 /indra/newview/llfriendcard.cpp
parentcdbdb1168694bcbfc58208f2941f513b556a0d6e (diff)
EXT-6727 : Allow LLInventoryObservers to target a single item (instead of a vector of items)
Added new constructors to LLInventoryFetch types to allow passing in a single item.
Diffstat (limited to 'indra/newview/llfriendcard.cpp')
-rw-r--r--indra/newview/llfriendcard.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/indra/newview/llfriendcard.cpp b/indra/newview/llfriendcard.cpp
index aaa09ba5da..945d2d26da 100644
--- a/indra/newview/llfriendcard.cpp
+++ b/indra/newview/llfriendcard.cpp
@@ -111,9 +111,9 @@ class LLInitialFriendCardsFetch : public LLInventoryFetchDescendentsObserver
public:
typedef boost::function<void()> callback_t;
- LLInitialFriendCardsFetch(const uuid_vec_t& ids,
+ LLInitialFriendCardsFetch(const LLUUID& folder_id,
callback_t cb) :
- LLInventoryFetchDescendentsObserver(ids),
+ LLInventoryFetchDescendentsObserver(folder_id),
mCheckFolderCallback(cb)
{}
@@ -410,10 +410,8 @@ void LLFriendCardsManager::findMatchedFriendCards(const LLUUID& avatarID, LLInve
void LLFriendCardsManager::fetchAndCheckFolderDescendents(const LLUUID& folder_id, callback_t cb)
{
- uuid_vec_t folders;
- folders.push_back(folder_id);
// This instance will be deleted in LLInitialFriendCardsFetch::done().
- LLInitialFriendCardsFetch* fetch = new LLInitialFriendCardsFetch(folders, cb);
+ LLInitialFriendCardsFetch* fetch = new LLInitialFriendCardsFetch(folder_id, cb);
fetch->startFetch();
if(fetch->isEverythingComplete())
{