diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-04-26 21:02:00 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-04-26 21:02:00 +0300 |
| commit | 5e5c5ca09c0add728f366ada48243b82f6aed38c (patch) | |
| tree | 896b668529e2a54c647f014d8d3a70ef1418790b /indra/newview/llappviewer.cpp | |
| parent | 59457cfcfe946223c2001fa9d9b66683b988315b (diff) | |
| parent | a44f03573d5d64102775922ff0e61f1bce2d1a22 (diff) | |
Merged SL-10400 and SL-10401
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 577082f01f..d6695e7f3e 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1167,11 +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 (!beingDebugged()) +#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) { - LLLeap::create(updater, true); + 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. |