summaryrefslogtreecommitdiff
path: root/indra/newview/llfolderview.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-03-30 18:19:56 +0300
committerVadim Savchuk <vsavchuk@productengine.com>2010-03-30 18:19:56 +0300
commit3e23c04c9b633f947faf8c7c11ed73ad78de8d3c (patch)
treea65e8b51b8622750038e93799274539329c66343 /indra/newview/llfolderview.cpp
parentc73dcb079991bad12458386274cec409013ad76b (diff)
parente1517318c58d6796b5566d5cf96c02474fd7376e (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llfolderview.cpp')
-rw-r--r--indra/newview/llfolderview.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index 1472f490bb..90a100bd9b 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -865,7 +865,7 @@ BOOL LLFolderView::getSelectionList(std::set<LLUUID> &selection) const
BOOL LLFolderView::startDrag(LLToolDragAndDrop::ESource source)
{
std::vector<EDragAndDropType> types;
- std::vector<LLUUID> cargo_ids;
+ uuid_vec_t cargo_ids;
selected_items_t::iterator item_it;
BOOL can_drag = TRUE;
if (!mSelectedItems.empty())