diff options
author | Richard Linden <none@none> | 2013-12-02 14:57:29 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2013-12-02 14:57:29 -0800 |
commit | 34ff2fc46ba8c623f0eab8fe1dccb5db327775a8 (patch) | |
tree | 7bc422dd969e1d18e9d83e52a9a6dcfa2bd6139f /indra/newview/llinventorymodel.h | |
parent | 787ccaf297e81291469aaf269f563d862fb150a3 (diff) | |
parent | d8e92867162f8c4ff9489d8eefde53546e907dff (diff) |
merge with release
Diffstat (limited to 'indra/newview/llinventorymodel.h')
-rwxr-xr-x | indra/newview/llinventorymodel.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h index 8aac879a93..69dba495d7 100755 --- a/indra/newview/llinventorymodel.h +++ b/indra/newview/llinventorymodel.h @@ -29,9 +29,8 @@ #include "llassettype.h" #include "llfoldertype.h" -#include "lldarray.h" #include "llframetimer.h" -#include "llhttpclient.h" +#include "llcurl.h" #include "lluuid.h" #include "llpermissionsflags.h" #include "llstring.h" @@ -75,11 +74,11 @@ public: CHILDREN_MAYBE }; - typedef LLDynamicArray<LLPointer<LLViewerInventoryCategory> > cat_array_t; - typedef LLDynamicArray<LLPointer<LLViewerInventoryItem> > item_array_t; + typedef std::vector<LLPointer<LLViewerInventoryCategory> > cat_array_t; + typedef std::vector<LLPointer<LLViewerInventoryItem> > item_array_t; typedef std::set<LLUUID> changed_items_t; - class fetchInventoryResponder : public LLHTTPClient::Responder + class fetchInventoryResponder : public LLCurl::Responder { public: fetchInventoryResponder(const LLSD& request_sd) : mRequestSD(request_sd) {}; |