summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorymodelbackgroundfetch.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2014-05-14 17:50:59 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2014-05-14 17:50:59 -0400
commit487ca1bad37883be0325b564ab557a8f77575388 (patch)
treea8e7c6163d18f41161f5477c8af31207d2b4eae2 /indra/newview/llinventorymodelbackgroundfetch.cpp
parent7b9708a2e3aede6faef04bd546c497dc68264f58 (diff)
v-r -> s-e merge WIP
Diffstat (limited to 'indra/newview/llinventorymodelbackgroundfetch.cpp')
-rwxr-xr-xindra/newview/llinventorymodelbackgroundfetch.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 5f8dc95d8a..2de37b0790 100755
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -172,7 +172,7 @@ void LLInventoryModelBackgroundFetch::setAllFoldersFetched()
mRecursiveLibraryFetchStarted)
{
mAllFoldersFetched = TRUE;
- //llinfos << "All folders fetched, validating" << llendl;
+ //LL_INFOS() << "All folders fetched, validating" << LL_ENDL;
//gInventory.validate();
}
mFolderFetchActive = false;
@@ -544,7 +544,7 @@ void LLInventoryModelFetchDescendentsResponder::httpSuccess()
// If we get back an error (not found, etc...), handle it here.
void LLInventoryModelFetchDescendentsResponder::httpFailure()
{
- llwarns << dumpResponse() << llendl;
+ LL_WARNS() << dumpResponse() << LL_ENDL;
LLInventoryModelBackgroundFetch *fetcher = LLInventoryModelBackgroundFetch::getInstance();
LL_INFOS() << dumpResponse() << LL_ENDL;