diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-06 15:55:07 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-06 15:55:07 +0100 |
| commit | 54c39177e58b9c189b96774d6ae3143d31559da0 (patch) | |
| tree | 424c9b7dccca0ce3d017c38dda9a6766f6c4d4b1 /indra/newview/llviewermenu.cpp | |
| parent | cbf1ae105a980a439cff39026f9e2c05d4f13859 (diff) | |
| parent | 7187f08e89ca1d10fb872070dc6381a0a926f57d (diff) | |
un-hairy merge from viewer-trunk
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index d3383f5c89..ec401f16d7 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -6152,7 +6152,7 @@ class LLAttachmentEnableDrop : public view_listener_t // if a fetch is already out there (being sent from a slow sim) // we refetch and there are 2 fetches LLWornItemFetchedObserver* wornItemFetched = new LLWornItemFetchedObserver(); - LLInventoryFetchObserver::item_ref_t items; //add item to the inventory item to be fetched + uuid_vec_t items; //add item to the inventory item to be fetched items.push_back((*attachment_iter)->getItemID()); |