From 7d94bcf72918779c311d92db67a7f67e2c737c9d Mon Sep 17 00:00:00 2001
From: Dave Houlton <euclid@lindenlab.com>
Date: Tue, 10 Mar 2020 11:41:39 -0600
Subject: DRTVWR-440 Add compile switch SHADER_CRASH_NONFATAL to prevent app
 exit on shader failure

---
 indra/newview/llappviewer.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview')

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()
-- 
cgit v1.2.3