diff options
| author | Rider Linden <rider@lindenlab.com> | 2025-03-25 09:58:43 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2025-03-25 09:58:43 -0700 |
| commit | b86c36eafcdb0fb42c1b68ef671050dea67dc6c3 (patch) | |
| tree | dfa54e83a9ccac2c5346210c05626e61760e2822 /indra/llcommon/llqueuedthread.cpp | |
| parent | 48ccb0f75b078670ced1f8fe8d4942abe0a6f293 (diff) | |
| parent | 423df2ba4b731417796478c449e3e8f3d166ef21 (diff) | |
Merge remote-tracking branch 'remotes/origin/develop' into rider/bot_tattle
Fix conflicts
Diffstat (limited to 'indra/llcommon/llqueuedthread.cpp')
| -rw-r--r-- | indra/llcommon/llqueuedthread.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llqueuedthread.cpp b/indra/llcommon/llqueuedthread.cpp index 1c4ac5a7bf..0196a24b18 100644 --- a/indra/llcommon/llqueuedthread.cpp +++ b/indra/llcommon/llqueuedthread.cpp @@ -146,7 +146,7 @@ size_t LLQueuedThread::updateQueue(F32 max_time_ms) // schedule a call to threadedUpdate for every call to updateQueue if (!isQuitting()) { - mRequestQueue.post([=]() + mRequestQueue.post([=, this]() { LL_PROFILE_ZONE_NAMED_CATEGORY_THREAD("qt - update"); mIdleThread = false; @@ -474,7 +474,7 @@ void LLQueuedThread::processRequest(LLQueuedThread::QueuedRequest* req) #else using namespace std::chrono_literals; auto retry_time = LL::WorkQueue::TimePoint::clock::now() + 16ms; - mRequestQueue.post([=] + mRequestQueue.post([=, this] { LL_PROFILE_ZONE_NAMED("processRequest - retry"); if (LL::WorkQueue::TimePoint::clock::now() < retry_time) |