From 93805cfbc12c247ceb1f422fb0b97310542d78d9 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Mon, 7 Feb 2022 22:50:37 +0200 Subject: SL-16778 handle shutdown exceptions These exceptions are expected and do not need to be logged --- indra/llmessage/llavatarnamecache.cpp | 4 ++++ indra/newview/llvoicevivox.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/indra/llmessage/llavatarnamecache.cpp b/indra/llmessage/llavatarnamecache.cpp index c67f59bc0c..846549b368 100644 --- a/indra/llmessage/llavatarnamecache.cpp +++ b/indra/llmessage/llavatarnamecache.cpp @@ -196,6 +196,10 @@ void LLAvatarNameCache::requestAvatarNameCache_(std::string url, std::vectorhandleAvNameCacheSuccess(results, httpResults); } } + catch (const LLCoros::Stop&) + { + LL_DEBUGS("AvNameCache") << "Received a shutdown exception" << LL_ENDL; + } catch (...) { LOG_UNHANDLED_EXCEPTION(STRINGIZE("coroutine " << LLCoros::getName() diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index 456537de28..015b676fef 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -689,6 +689,10 @@ void LLVivoxVoiceClient::voiceControlCoro() // surviving longer than LLVivoxVoiceClient voiceControlStateMachine(state); } + catch (const LLCoros::Stop&) + { + LL_DEBUGS("LLVivoxVoiceClient") << "Received a shutdown exception" << LL_ENDL; + } catch (const LLContinueError&) { LOG_UNHANDLED_EXCEPTION("LLVivoxVoiceClient"); -- cgit v1.2.3