diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-05-05 01:40:40 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-05-05 01:40:40 +0300 |
commit | 30234c508b4ef8921359371de7ef79546aea5626 (patch) | |
tree | 07286f53e369104e80ea008c2c767b9dfbed147d /indra/llcorehttp/_httpservice.cpp | |
parent | 59433e3132b057003afcc1ba230ff16ffe62f92c (diff) | |
parent | 4a7fd0117a43dca9e30c58c6417ebdf6862561f6 (diff) |
Merge branch 'master' into DRTVWR-507-maint
Diffstat (limited to 'indra/llcorehttp/_httpservice.cpp')
-rw-r--r-- | indra/llcorehttp/_httpservice.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcorehttp/_httpservice.cpp b/indra/llcorehttp/_httpservice.cpp index 0b72b53186..34268d94f6 100644 --- a/indra/llcorehttp/_httpservice.cpp +++ b/indra/llcorehttp/_httpservice.cpp @@ -318,7 +318,7 @@ void HttpService::threadRun(LLCoreInt::HttpThread * thread) { LOG_UNHANDLED_EXCEPTION(""); } - catch (std::bad_alloc) + catch (std::bad_alloc&) { LLMemory::logMemoryInfo(TRUE); |