diff options
| -rwxr-xr-x | build.sh | 6 | ||||
| -rw-r--r-- | indra/newview/llappviewerwin32.cpp | 6 |
2 files changed, 7 insertions, 5 deletions
@@ -114,8 +114,6 @@ pre_build() if [ -n "${BUGSPLAT_DB:-}" ] then echo export BUGSPLAT_DB export BUGSPLAT_DB - echo RELEASE_CRASH_REPORTING=OFF - RELEASE_CRASH_REPORTING=OFF fi fi set -x @@ -428,7 +426,9 @@ then if [ "$last_built_variant" = "Release" ] then # nat 2016-12-22: without RELEASE_CRASH_REPORTING, we have no symbol file. - if [ "${RELEASE_CRASH_REPORTING:-}" != "OFF" ] + # Likewise, BUGSPLAT_DB suppresses generating the symbol file. + if [ "${RELEASE_CRASH_REPORTING:-}" != "OFF" \ + -a -z "${BUGSPLAT_DB:-}" ] then # Upload crash reporter file # These names must match the set of VIEWER_SYMBOL_FILE in indra/newview/CMakeLists.txt diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp index 3efc94d7b5..247b94db3e 100644 --- a/indra/newview/llappviewerwin32.cpp +++ b/indra/newview/llappviewerwin32.cpp @@ -559,11 +559,13 @@ bool LLAppViewerWin32::init() #if LL_SEND_CRASH_REPORTS #if ! defined(LL_BUGSPLAT) +#pragma message("Building without BugSplat") LLAppViewer* pApp = LLAppViewer::instance(); pApp->initCrashReporting(); #else // LL_BUGSPLAT +#pragma message("Building with BugSplat") std::string build_data_fname( gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, "build_data.json")); @@ -579,7 +581,7 @@ bool LLAppViewerWin32::init() Json::Value build_data; if (! reader.parse(inf, build_data, false)) // don't collect comments { - // gah, the typo is baked into their API + // gah, the typo is baked into Json::Reader API LL_WARNS() << "Can't initialize BugSplat, can't parse '" << build_data_fname << "': " << reader.getFormatedErrorMessages() << LL_ENDL; } @@ -609,7 +611,7 @@ bool LLAppViewerWin32::init() // engage stringize() overload that converts from wstring LL_INFOS() << "Engaged BugSplat(" << LL_TO_STRING(LL_VIEWER_CHANNEL) - << stringize(version_string) << ')' << LL_ENDL; + << ' ' << stringize(version_string) << ')' << LL_ENDL; } // got BugSplat_DB } // parsed build_data.json } // opened build_data.json |