diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-03-27 10:12:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-27 10:12:53 +0200 |
| commit | 16e638db975278f6018fe1e21ba1954b7f159149 (patch) | |
| tree | 876030bddc3b9e6cd885f829fb4a071aea309508 /indra/llcorehttp | |
| parent | f815b015cecda18098dd2d16f65682a37e1bff7c (diff) | |
| parent | 990c8b81dad8bd0580c2c48f77e99b3ac53e581e (diff) | |
Merge pull request #1062 from secondlife/marchcat/yz-merge
Merge main into maint YZ
Diffstat (limited to 'indra/llcorehttp')
| -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; |