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

Added OK/Cancel dialog on LLErr for debug builds, added Linux gdb fallback so you can use 'cont' to continue after an LLErr. Might work the same for OSX, if a dev wants to check. Thanks to Kitty for pointers.

master
ziree 2011-10-22 19:01:06 +02:00
parent 7fb04b35f3
commit a384a44eee
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/llappviewer.cpp
View File

@ -2032,20 +2032,29 @@ bool LLAppViewer::initThreads()
void errorCallback(const std::string &error_string)
{
#ifndef LL_RELEASE_FOR_DOWNLOAD
#if !LL_RELEASE_FOR_DOWNLOAD
if (OSBTN_CANCEL == OSMessageBox(error_string, LLTrans::getString("MBFatalError"), OSMB_OKCANCEL))
return;
#else
OSMessageBox(error_string, LLTrans::getString("MBFatalError"), OSMB_OK);
#endif
#endif // !LL_RELEASE_FOR_DOWNLOAD
//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.6.0a) | Added: Catznip-2.4.0g
#if !LL_RELEASE_FOR_DOWNLOAD && LL_WINDOWS
#if !LL_RELEASE_FOR_DOWNLOAD
#if LL_WINDOWS
DebugBreak();
#elif LL_LINUX
raise(SIGINT);
#else // other OSes could hook in here, too
LLError::crashAndLoop(error_string);
#endif // LL_WINDOWS
#else
LLError::crashAndLoop(error_string);
#endif // LL_RELEASE_WITH_DEBUG_INFO && LL_WINDOWS
#endif // !LL_RELEASE_FOR_DOWNLOAD
// [/SL:KB]
}