summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2019-04-26 21:11:16 +0300
committerAndreyL ProductEngine <alihatskiy@productengine.com>2019-04-26 21:11:16 +0300
commitb78b5da79a74deb8efe5486b251b2db8361e1485 (patch)
treee7ff18fa04a38b077cb9592da539b810da315f5e /indra/newview/llappviewer.cpp
parente5339156ca6c406ca57ca2d21aea92f9b1795733 (diff)
parent5e5c5ca09c0add728f366ada48243b82f6aed38c (diff)
Merged in lindenlab/viewer-bear
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r--indra/newview/llappviewer.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 6202a382b1..932a1ef46f 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1167,12 +1167,16 @@ bool LLAppViewer::init()
// ForceAddressSize
updater.args.add(stringize(gSavedSettings.getU32("ForceAddressSize")));
-#if !LL_RELEASE_FOR_DOWNLOAD && !LL_SEND_CRASH_REPORTS
- // This is neither a release package, nor crash-reporting enabled test build
- // Note: pointless to launch on Windows - it shouldn't expect secondlife-bin.exe
- LL_WARNS("LLLeap") << "Launching without version checker" << LL_ENDL;
+#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.
+ // Run the updater. An exception from launching the updater should bother us.
LLLeap::create(updater, true);
#endif