diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-10-19 17:31:05 -0700 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-19 17:31:05 -0700 |
| commit | 1d5be6eca1969da3e6b923cbf5326d3bdc8b066f (patch) | |
| tree | a03a2e782f5022ebbbe1ef933e3a11c1b9de00a6 /indra/newview/llinventorymodel.h | |
| parent | 97d2b740d3e700d86665183d5fc5cfcb3efe72d6 (diff) | |
| parent | d78520f6b7fd4a20bbb1d1291a34761efc1fd740 (diff) | |
merge
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 91a1906fab..e7f9db9221 100644 --- a/indra/newview/llinventorymodel.h +++ b/indra/newview/llinventorymodel.h @@ -329,10 +329,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. |