From 7ab41a8a815968e274ebbfc459328be40cf5479a Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Fri, 5 Feb 2010 15:59:14 -0800 Subject: transplant with 2517, also fix single username login issue --- indra/newview/llinventorymodel.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'indra/newview/llinventorymodel.cpp') 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 || -- cgit v1.2.3