summaryrefslogtreecommitdiff
path: root/indra/newview/llaisapi.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llaisapi.cpp')
-rw-r--r--indra/newview/llaisapi.cpp27
1 files changed, 5 insertions, 22 deletions
diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index 087cfb8d48..17e1a27934 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -873,26 +873,9 @@ void AISAPI::InvokeAISCommandCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t ht
LLSD httpResults;
LLCore::HttpStatus status;
- if (debugLoggingEnabled("Inventory"))
- {
- LLTimer ais_timer;
- ais_timer.start();
- result = invoke(httpAdapter , httpRequest , url , body , httpOptions , httpHeaders);
- httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS];
- status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
- F32MillisecondsImplicit elapsed_time = ais_timer.getElapsedTimeF32();
-
- LL_DEBUGS("Inventory") << "Request type: " << (S32)type
- << " \nRequest target: " << targetId
- << " \nElapsed time since request: " << elapsed_time
- << " \nstatus: " << status.toULong() << LL_ENDL;
- }
- else
- {
- result = invoke(httpAdapter , httpRequest , url , body , httpOptions , httpHeaders);
- httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS];
- status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
- }
+ result = invoke(httpAdapter , httpRequest , url , body , httpOptions , httpHeaders);
+ httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS];
+ status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
if (!status || !result.isMap())
{
@@ -1053,7 +1036,7 @@ AISUpdate::AISUpdate(const LLSD& update, AISAPI::COMMAND_TYPE type, const LLSD&
mFetchDepth = request_body["depth"].asInteger();
}
- mTimer.setTimerExpirySec(debugLoggingEnabled("Inventory") ? EXPIRY_SECONDS_DEBUG : EXPIRY_SECONDS_LIVE);
+ mTimer.setTimerExpirySec(AIS_EXPIRY_SECONDS);
mTimer.start();
parseUpdate(update);
}
@@ -1079,7 +1062,7 @@ void AISUpdate::checkTimeout()
{
llcoro::suspend();
LLCoros::checkStop();
- mTimer.setTimerExpirySec(debugLoggingEnabled("Inventory") ? EXPIRY_SECONDS_DEBUG : EXPIRY_SECONDS_LIVE);
+ mTimer.setTimerExpirySec(AIS_EXPIRY_SECONDS);
}
}