summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llappviewer.cpp13
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;