diff options
author | Richard Linden <none@none> | 2014-01-09 12:22:24 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2014-01-09 12:22:24 -0800 |
commit | 15e6939342956f830996299352bcf7fffa7c3b85 (patch) | |
tree | dcd6443f049d35b3f3401d768b1eab735eda363b /indra/newview/llinventoryitemslist.h | |
parent | d8a81b240e828a8ab27709fb11038a4b5c4d5428 (diff) | |
parent | 1d0d485b69bbbfd63d2d56a795d818131db2667c (diff) |
merge with release
Diffstat (limited to 'indra/newview/llinventoryitemslist.h')
-rwxr-xr-x | indra/newview/llinventoryitemslist.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llinventoryitemslist.h b/indra/newview/llinventoryitemslist.h index b183a2052d..1aa230df99 100755 --- a/indra/newview/llinventoryitemslist.h +++ b/indra/newview/llinventoryitemslist.h @@ -29,8 +29,6 @@ #ifndef LL_LLINVENTORYITEMSLIST_H #define LL_LLINVENTORYITEMSLIST_H -#include "lldarray.h" - // newview #include "llflatlistview.h" @@ -46,7 +44,7 @@ public: virtual ~LLInventoryItemsList(); - void refreshList(const LLDynamicArray<LLPointer<LLViewerInventoryItem> > item_array); + void refreshList(const std::vector<LLPointer<LLViewerInventoryItem> > item_array); boost::signals2::connection setRefreshCompleteCallback(const commit_signal_t::slot_type& cb); |