From 5d7b1b09ff195611548bababf36d412ef76ed924 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 4 Oct 2023 00:01:51 +0300 Subject: MacOS build fix --- indra/newview/llaisapi.cpp | 4 ++-- indra/newview/llaisapi.h | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp index b7d0b1ef1a..17e1a27934 100644 --- a/indra/newview/llaisapi.cpp +++ b/indra/newview/llaisapi.cpp @@ -1036,7 +1036,7 @@ AISUpdate::AISUpdate(const LLSD& update, AISAPI::COMMAND_TYPE type, const LLSD& mFetchDepth = request_body["depth"].asInteger(); } - mTimer.setTimerExpirySec(EXPIRY_SECONDS_LIVE); + mTimer.setTimerExpirySec(AIS_EXPIRY_SECONDS); mTimer.start(); parseUpdate(update); } @@ -1062,7 +1062,7 @@ void AISUpdate::checkTimeout() { llcoro::suspend(); LLCoros::checkStop(); - mTimer.setTimerExpirySec(EXPIRY_SECONDS_LIVE); + mTimer.setTimerExpirySec(AIS_EXPIRY_SECONDS); } } diff --git a/indra/newview/llaisapi.h b/indra/newview/llaisapi.h index 0fdf4a0b74..f254f21e42 100644 --- a/indra/newview/llaisapi.h +++ b/indra/newview/llaisapi.h @@ -130,10 +130,9 @@ private: void clearParseResults(); void checkTimeout(); - // Debug is very log-heavy, give it more time or it will take forever to process - // Todo: find a way to make throttle static isntead of per-request - const F32 EXPIRY_SECONDS_DEBUG = 1.f; - const F32 EXPIRY_SECONDS_LIVE = 0.008f; + // Fetch can return large packets of data, throttle it to not cause lags + // Todo: make throttle work over all fetch requests isntead of per-request + const F32 AIS_EXPIRY_SECONDS = 0.008f; typedef std::map uuid_int_map_t; uuid_int_map_t mCatDescendentDeltas; -- cgit v1.2.3