diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2019-04-23 15:31:25 +0100 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2019-04-23 15:31:25 +0100 |
commit | d1f5e87ad08f63cf8bdf0421566d6e646f76a6d0 (patch) | |
tree | 515fd1a2343ff52e761ccac53f52250b1ac08335 /indra/newview | |
parent | 099e58f75b3edc036cff9f6cf5587dacaf16e3fc (diff) |
via viewer-neko - don't crash test viewer due to missing version checker
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/llappviewer.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 1bc21ec469..f54d87e5a3 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1167,8 +1167,18 @@ bool LLAppViewer::init() // ForceAddressSize updater.args.add(stringize(gSavedSettings.getU32("ForceAddressSize"))); - // Run the updater. An exception from launching the updater should bother us. +#if LL_WINDOWS && !LL_RELEASE_FOR_DOWNLOAD && !LL_SEND_CRASH_REPORTS + // This is neither a release package, nor crash-reporting enabled test build + // try to run version updater, but don't bother if it fails (file might be missing) + LLLeap *leap_p = LLLeap::create(updater, false); + if (!leap_p) + { + LL_WARNS("LLLeap") << "Failed to run LLLeap" << LL_ENDL; + } +#else + // Run the updater. An exception from launching the updater should bother us. LLLeap::create(updater, true); +#endif // Iterate over --leap command-line options. But this is a bit tricky: if // there's only one, it won't be an array at all. |