diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-03-01 15:31:04 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-03-01 15:31:04 -0800 |
| commit | b11a625e6ff89470d25273fa426ed13f7abc4a6a (patch) | |
| tree | a5e923a8211926f119f1cf45ded6cd4222c9250b /indra/newview/llinventorymodel.cpp | |
| parent | 6575b685e91d334198789c88dec2efab7e5a1ac9 (diff) | |
| parent | a2efe4bb4154b7ecb9c7cb279f7a28d7d401a93a (diff) | |
Automated merge with a few fixups for code review comments
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 326f2a5577..4bd53ecd01 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 || |