diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-03-27 10:13:05 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-27 10:13:05 +0200 |
commit | bcb5210f6b51b65174425849fbe4cbc53e424c8d (patch) | |
tree | 04420f59b47894d7945a44d995b72d6badb1c02c /indra/llcorehttp/_httpservice.cpp | |
parent | f25f51a20a7bcefcf51de5e71f827c74c659571a (diff) | |
parent | ccefd2f719e97c353dd85b51098a29786924190c (diff) |
Merge pull request #1063 from secondlife/marchcat/b-merge
Merge main into maint B
Diffstat (limited to 'indra/llcorehttp/_httpservice.cpp')
-rw-r--r-- | indra/llcorehttp/_httpservice.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llcorehttp/_httpservice.cpp b/indra/llcorehttp/_httpservice.cpp index 294acd7f63..517076804d 100644 --- a/indra/llcorehttp/_httpservice.cpp +++ b/indra/llcorehttp/_httpservice.cpp @@ -320,6 +320,7 @@ void HttpService::threadRun(LLCoreInt::HttpThread * thread) LLMemory::logMemoryInfo(TRUE); //output possible call stacks to log file. + LLError::LLUserWarningMsg::showOutOfMemory(); LLError::LLCallStacks::print(); LL_ERRS() << "Bad memory allocation in HttpService::threadRun()!" << LL_ENDL; |