diff options
| -rw-r--r-- | indra/newview/llaisapi.cpp | 13 | ||||
| -rw-r--r-- | indra/newview/llinventorymodelbackgroundfetch.cpp | 8 |
2 files changed, 10 insertions, 11 deletions
diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp index 92589540f1..ef3305a69d 100644 --- a/indra/newview/llaisapi.cpp +++ b/indra/newview/llaisapi.cpp @@ -684,7 +684,7 @@ void AISAPI::onUpdateReceived(const std::string& context, const LLSD& update, CO } AISUpdate ais_update(update, is_fetch, depth); ais_update.doUpdate(); // execute the updates in the appropriate order. - LL_DEBUGS("Inventory") << "elapsed: " << timer.getElapsedTimeF32() << LL_ENDL; + LL_DEBUGS("Inventory", "AIS3") << "Elapsed processing: " << timer.getElapsedTimeF32() << LL_ENDL; } /*static*/ @@ -707,13 +707,11 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht httpOptions->setTimeout(180); - LL_DEBUGS("Inventory") << "url: " << url << LL_ENDL; - LLSD result; LLSD httpResults; LLCore::HttpStatus status; - if (debugLoggingEnabled("AIS3")) + if (debugLoggingEnabled("Inventory")) { LLTimer ais_timer; ais_timer.start(); @@ -721,10 +719,11 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS]; status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults); F32MillisecondsImplicit elapsed_time = ais_timer.getElapsedTimeF32(); - LL_DEBUGS("AIS3") << "Request type: " << (S32)type + + LL_DEBUGS("Inventory") << "Request type: " << (S32)type << " \nRequest url: " << url << " \nRequest target: " << targetId - << " \nElapsed time: " << elapsed_time + << " \nElapsed time ince request: " << elapsed_time << " \nstatus: " << status.toULong() << LL_ENDL; } else @@ -785,7 +784,7 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht LL_WARNS("Inventory") << ll_pretty_print_sd(result) << LL_ENDL; } - LL_DEBUGS("Inventory") << result << LL_ENDL; + LL_DEBUGS("Inventory", "AIS3") << "Result: " << result << LL_ENDL; onUpdateReceived("AISCommand", result, type, body); if (callback && !callback.empty()) diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp index 69f688d51e..f650cc383f 100644 --- a/indra/newview/llinventorymodelbackgroundfetch.cpp +++ b/indra/newview/llinventorymodelbackgroundfetch.cpp @@ -461,7 +461,7 @@ void LLInventoryModelBackgroundFetch::incrFetchFolderCount(S32 fetching) void ais_simple_item_callback(const LLUUID& inv_id) { - LL_DEBUGS("AIS3") << "Response for " << inv_id << LL_ENDL; + LL_DEBUGS(LOG_INV , "AIS3") << "Response for " << inv_id << LL_ENDL; LLInventoryModelBackgroundFetch::instance().incrFetchCount(-1); } @@ -488,7 +488,7 @@ void LLInventoryModelBackgroundFetch::onAISFolderCalback(const LLUUID &request_i if (response_id.isNull()) // Failure { - LL_DEBUGS("AIS3") << "Failure response for folder " << request_id << LL_ENDL; + LL_DEBUGS(LOG_INV , "AIS3") << "Failure response for folder " << request_id << LL_ENDL; if (recursion == FT_RECURSIVE) { // A full recursive request failed. @@ -521,7 +521,7 @@ void LLInventoryModelBackgroundFetch::onAISFolderCalback(const LLUUID &request_i } else { - LL_DEBUGS("AIS3") << "Got folder " << request_id << LL_ENDL; + LL_DEBUGS(LOG_INV , "AIS3") << "Got folder " << request_id << LL_ENDL; if (recursion == FT_CONTENT_RECURSIVE) { // Got the folder, now recursively request content @@ -611,7 +611,7 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis() if (!mExpectedFolderIds.empty()) { // A folder seem to be stack fetching on QA account, print oldest folder out - LL_DEBUGS("AIS3") << "Oldest expected folder: "; + LL_DEBUGS(LOG_INV , "AIS3") << "Oldest expected folder: "; std::list<LLUUID>::const_iterator iter = mExpectedFolderIds.begin(); LL_CONT << *iter; if ((*iter).notNull()) |