diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-01-17 17:05:53 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-01-17 17:05:53 +0200 |
| commit | fab8eeeb86075173c708c7adb18ea4ad273e0e13 (patch) | |
| tree | 3c986c60ad05a2a0683711f6d7980d94db542f0d | |
| parent | 2269a9f0747173a24b2c8463f8a20a7b40bc8833 (diff) | |
MAINT-8154 Brought back the LLContinueError handling
| -rw-r--r-- | indra/newview/llappviewer.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 3b11c9ff75..ea6842b62a 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1328,6 +1328,10 @@ bool LLAppViewer::frame() { ret = doFrame(); } + catch (const LLContinueError&) + { + LOG_UNHANDLED_EXCEPTION(""); + } catch (std::bad_alloc) { LLMemory::logMemoryInfo(TRUE); @@ -1341,7 +1345,14 @@ bool LLAppViewer::frame() } else { - ret = doFrame(); + try + { + ret = doFrame(); + } + catch (const LLContinueError&) + { + LOG_UNHANDLED_EXCEPTION(""); + } } return ret; |