livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- 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
meow-7.2.2
Kitty Barnett 2010-12-04 05:26:14 +01:00
parent 867614b044
commit 0ac151bb11
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.hgpatchinfo/Viewer-Build.desc
View File

@ -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

7
indra/newview/llappviewer.cpp
View File

@ -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()