summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorDave Houlton <euclid@lindenlab.com>2020-03-10 11:41:39 -0600
committerDave Houlton <euclid@lindenlab.com>2020-03-10 12:01:24 -0600
commit7d94bcf72918779c311d92db67a7f67e2c737c9d (patch)
treea53cba6729681017123b63e2582bb040b9c01482 /indra/newview
parentf9eada575bfa46a1da5aeaf27c73537a9b86aa76 (diff)
DRTVWR-440 Add compile switch SHADER_CRASH_NONFATAL to prevent app exit on shader failure
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llappviewer.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 73a58fee16..118edb8beb 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -2212,7 +2212,9 @@ void errorCallback(const std::string &error_string)
// static info file.
LLAppViewer::instance()->writeDebugInfo();
+#ifndef SHADER_CRASH_NONFATAL
LLError::crashAndLoop(error_string);
+#endif
}
void LLAppViewer::initLoggingAndGetLastDuration()