diff options
author | Palmer <palmer@lindenlab.com> | 2009-11-02 14:16:08 -0800 |
---|---|---|
committer | Palmer <palmer@lindenlab.com> | 2009-11-02 14:16:08 -0800 |
commit | b81feb6ae7fd9d01b63999e53c5c231551d53200 (patch) | |
tree | 527df9920d7d27000981fe726e5fbed9deccadbd /indra/newview/llinventorymodel.h | |
parent | 3e80fa3dbc943de9b784fedc202ba38cf238f46d (diff) | |
parent | 74dda61dfbccfd9ab5ef309aeb4b2b8c86e06cd6 (diff) |
Merge of viewer-2-0 changes
Diffstat (limited to 'indra/newview/llinventorymodel.h')
-rw-r--r-- | indra/newview/llinventorymodel.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h index c2d8717b70..d51460b374 100644 --- a/indra/newview/llinventorymodel.h +++ b/indra/newview/llinventorymodel.h @@ -112,7 +112,9 @@ public: // construction & destruction LLInventoryModel(); ~LLInventoryModel(); - + + void cleanupInventory(); + class fetchInventoryResponder : public LLHTTPClient::Responder { public: @@ -332,10 +334,8 @@ public: // methods to load up inventory skeleton & meat. These are used // during authentication. return true if everything parsed. - typedef std::map<std::string, std::string> response_t; - typedef std::vector<response_t> options_t; - bool loadSkeleton(const options_t& options, const LLUUID& owner_id); - bool loadMeat(const options_t& options, const LLUUID& owner_id); + bool loadSkeleton(const LLSD& options, const LLUUID& owner_id); + bool loadMeat(const LLSD& options, const LLUUID& owner_id); // This is a brute force method to rebuild the entire parent-child // relations. |