Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://Shyotl@bitbucket.org/LightDrake/singularityviewer-internal.git into FMODStudio

Browse Source 
Conflicts:
	indra/llcommon/llsingleton.h
This commit is contained in:
Shyotl
2014-11-22 22:19:44 -06:00
parent 7054a2a6d2 19cae9b59b
commit f8927a8a11
704 changed files with 6482 additions and 4774 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llcommon/llapp.cpp
View File

@@ -386,12 +386,12 @@ void LLApp::setupErrorHandling()
// installing the handler.
installHandler = true;
}
#endif
if(installHandler && (mExceptionHandler == 0))
{
mExceptionHandler = new google_breakpad::ExceptionHandler(mDumpPath, clear_CrashLoggerReserve_callback, &unix_post_minidump_callback, 0, true, 0);
}
#endif
#elif LL_LINUX
if(installHandler && (mExceptionHandler == 0))
{