From 0ac151bb11a5f243e71389ab33cbef840be1fb83 Mon Sep 17 00:00:00 2001 From: Kitty Barnett <develop@catznip.com> Date: Sat, 4 Dec 2010 05:26:14 +0100 Subject: [PATCH] - changed : break into the debugger rather than forcing the process into an unrecoverable state for "llerrs" on non-release builds [Windows only] --HG-- branch : Viewer-Build --- .hgpatchinfo/Viewer-Build.desc | 10 ++++++---- indra/newview/llappviewer.cpp | 7 +++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.hgpatchinfo/Viewer-Build.desc b/.hgpatchinfo/Viewer-Build.desc index 122ab7adfb0..f784e6d7418 100644 --- a/.hgpatchinfo/Viewer-Build.desc +++ b/.hgpatchinfo/Viewer-Build.desc @@ -1,5 +1,7 @@ [Viewer/Build] -- changed : compiler options for "Release with Debug" builds -- changed : compiler and linker options for "Release" builds -- added : imported SNOW-788 - Fix boost lib detection with Visual Studio to allow multiple VS versions -- changed : removed LL's changeset tags and added new (consistent) SL-2.X.Y tags for releases +- changed : compiler options for "Release with Debug" builds +- changed : compiler and linker options for "Release" builds +- added : imported SNOW-788 - Fix boost lib detection with Visual Studio to allow multiple VS versions +- changed : removed LL's changeset tags and added new (consistent) SL-2.X.Y tags for releases +- changed : break into the debugger rather than forcing the process into an unrecoverable state for "llerrs" on non-release builds + -> Windows only diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 6c07974f69b..531d03dff8d 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1792,7 +1792,14 @@ void errorCallback(const std::string &error_string) //Set the ErrorActivated global so we know to create a marker file gLLErrorActivated = true; +// LLError::crashAndLoop(error_string); +// [SL:KB] - Patch: Viewer-Build | Checked: 2010-12-04 (Catznip-2.4.0g) | Added: Catznip-2.4.0g +#if !LL_RELEASE_FOR_DOWNLOAD && LL_WINDOWS + DebugBreak(); +#else LLError::crashAndLoop(error_string); +#endif // LL_RELEASE_WITH_DEBUG_INFO && LL_WINDOWS +// [/SL:KB] } bool LLAppViewer::initLogging() -- GitLab