From fab8eeeb86075173c708c7adb18ea4ad273e0e13 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Wed, 17 Jan 2018 17:05:53 +0200
Subject: [PATCH] MAINT-8154 Brought back the LLContinueError handling
---
indra/newview/llappviewer.cpp | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 3b11c9ff758..ea6842b62a9 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;
--
GitLab