diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-04-20 11:52:00 -0400 | 
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-04-20 11:52:00 -0400 | 
| commit | ddd476c90c99c75a4add6c00243a90e84e025402 (patch) | |
| tree | 5ec50ad42336e167305c4d4146eef4b1e14d5aac /indra/llcommon | |
| parent | a6bc849992ea120e6d05ac4b6ddf61c9ee807588 (diff) | |
MAINT-6322 fix merge error that prevented crash dumps from being located for upload (and add better logging)
Diffstat (limited to 'indra/llcommon')
| -rwxr-xr-x | indra/llcommon/llapp.cpp | 6 | 
1 files changed, 3 insertions, 3 deletions
| diff --git a/indra/llcommon/llapp.cpp b/indra/llcommon/llapp.cpp index 5a40845e7d..eb0699ad41 100755 --- a/indra/llcommon/llapp.cpp +++ b/indra/llcommon/llapp.cpp @@ -929,7 +929,7 @@ bool unix_minidump_callback(const google_breakpad::MinidumpDescriptor& minidump_  	strncpy(path, minidump_desc.path(), remaining); -	LL_INFOS() << "generated minidump: " << LLApp::instance()->getMiniDumpFilename() << LL_ENDL; +	LL_INFOS("CRASHREPORT") << "generated minidump: " << LLApp::instance()->getMiniDumpFilename() << LL_ENDL;  	LLApp::runErrorHandler();  #ifndef LL_RELEASE_FOR_DOWNLOAD @@ -975,7 +975,7 @@ bool unix_post_minidump_callback(const char *dump_dir,  		strncpy(path, ".dmp", remaining);  	} -	LL_INFOS() << "generated minidump: " << LLApp::instance()->getMiniDumpFilename() << LL_ENDL; +	LL_INFOS("CRASHREPORT") << "generated minidump: " << LLApp::instance()->getMiniDumpFilename() << LL_ENDL;  	LLApp::runErrorHandler();  #ifndef LL_RELEASE_FOR_DOWNLOAD @@ -1019,7 +1019,7 @@ bool windows_post_minidump_callback(const wchar_t* dump_path,  		strncpy(path, ".dmp", remaining);  	} -	LL_INFOS() << "generated minidump: " << LLApp::instance()->getMiniDumpFilename() << LL_ENDL; +	LL_INFOS("CRASHREPORT") << "generated minidump: " << LLApp::instance()->getMiniDumpFilename() << LL_ENDL;     // *NOTE:Mani - this code is stolen from LLApp, where its never actually used.  	//OSMessageBox("Attach Debugger Now", "Error", OSMB_OK);     // *TODO: Translate the signals/exceptions into cross-platform stuff | 
