diff options
author | Roxie Linden <roxie@lindenlab.com> | 2010-02-05 15:59:14 -0800 |
---|---|---|
committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-05 15:59:14 -0800 |
commit | 7ab41a8a815968e274ebbfc459328be40cf5479a (patch) | |
tree | bb436c37aae93f1925e66802558cf388a74ae7f4 /indra/newview/llinventorymodel.cpp | |
parent | b5f64f9a3f69990d584990b20957e5de9ed2d5b0 (diff) |
transplant with 2517, also fix single username login issue
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 711114173c..89f5ef026a 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -1568,10 +1568,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 || |