diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-05-11 20:05:46 +0000 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-05-11 20:05:46 +0000 |
| commit | dc934629919bdcaea72c78e5291263914fb958ec (patch) | |
| tree | 0ac81213f607d9a3a133481758fa2274fe986aa3 /indra/newview/llinventorymodel.h | |
| parent | 3800c0df910c83e987184d541b868168fc2b5bec (diff) | |
svn merge -r113003:119136 svn+ssh://svn.lindenlab.com/svn/linden/branches/login-api/login-api-2 svn+ssh://svn.lindenlab.com/svn/linden/branches/login-api/login-api-3
Diffstat (limited to 'indra/newview/llinventorymodel.h')
| -rw-r--r-- | indra/newview/llinventorymodel.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h index d73fef7207..fcb3cc737a 100644 --- a/indra/newview/llinventorymodel.h +++ b/indra/newview/llinventorymodel.h @@ -314,10 +314,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. |