diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-03-10 18:21:19 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-03-10 18:21:19 +0000 |
| commit | 40526d548953a06a432bab4cd59af7949440f7c6 (patch) | |
| tree | a53cba6729681017123b63e2582bb040b9c01482 /indra/newview/llappviewer.cpp | |
| parent | 59da175ae8430b9f7299efdb5e52beae4cb65f2b (diff) | |
| parent | 7d94bcf72918779c311d92db67a7f67e2c737c9d (diff) | |
Merged in SL-12592 (pull request #28)
SL-12592 prevent unintended opaque-ification of alpha-blended materials
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 2 |
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() |