diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-03-08 21:39:38 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-03-08 21:39:38 -0800 |
| commit | 20379fecd9aea4d3450bcda815ad63f0ce9c729f (patch) | |
| tree | 21ef1bddf49efc133b9ec74e572345125fb62175 /indra/newview/llinventorymodel.cpp | |
| parent | 78abe4f5ffb02e14cd98f049b8100d20a82f3b1c (diff) | |
| parent | 8bd5a3bca38b0ba663d3563029e54da057020424 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llinventorymodel.cpp')
| -rw-r--r-- | indra/newview/llinventorymodel.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index 83a466a243..c10cdd9efd 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -1576,10 +1576,15 @@ void LLInventoryModel::bulkFetch(std::string url) folder_sd["fetch_folders"] = TRUE; //(LLSD::Boolean)sFullFetchStarted; folder_sd["fetch_items"] = (LLSD::Boolean)TRUE; - if (ALEXANDRIA_LINDEN_ID == cat->getOwnerID()) - body_lib["folders"].append(folder_sd); - else + if (gAgent.getID() == cat->getOwnerID()) + { body["folders"].append(folder_sd); + } + else + { + body_lib["folders"].append(folder_sd); + } + folder_count++; } if (sMyInventoryFetchStarted || |