summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-04-06 15:55:07 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-04-06 15:55:07 +0100
commit54c39177e58b9c189b96774d6ae3143d31559da0 (patch)
tree424c9b7dccca0ce3d017c38dda9a6766f6c4d4b1 /indra/newview/llinventorybridge.cpp
parentcbf1ae105a980a439cff39026f9e2c05d4f13859 (diff)
parent7187f08e89ca1d10fb872070dc6381a0a926f57d (diff)
un-hairy merge from viewer-trunk
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
-rw-r--r--indra/newview/llinventorybridge.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 83248e9991..614d73205c 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -2017,7 +2017,7 @@ void LLRightClickInventoryFetchDescendentsObserver::done()
LLRightClickInventoryFetchObserver* outfit;
outfit = new LLRightClickInventoryFetchObserver(mCompleteFolders.front(), mCopyItems);
- LLInventoryFetchObserver::item_ref_t ids;
+ uuid_vec_t ids;
for(S32 i = 0; i < count; ++i)
{
ids.push_back(item_array.get(i)->getUUID());