diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2022-11-22 23:11:29 +0200 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2022-11-22 23:12:05 +0200 |
| commit | de0317cc3f5f42ccf51a7bbfdd04e8b16d51e811 (patch) | |
| tree | 36b368602ac3aa1bdf9df97a0fb65c92767f457f /indra/newview/llappviewer.cpp | |
| parent | daa1257466ee3cf000e2c94ef05259577ea513b4 (diff) | |
| parent | 395a60a83e954e9bcbb44dc6f1a49319b2d628b7 (diff) | |
Merge branch 'DRTVWR-568' into DRTVWR-539
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 6ef92c98ef..8fbb35034f 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -304,7 +304,7 @@ S32 gLastExecDuration = -1; // (<0 indicates unknown) # define LL_PLATFORM_KEY "mac" #elif LL_LINUX # define LL_PLATFORM_KEY "lnx" -else +#else # error "Unknown Platform" #endif const char* gPlatform = LL_PLATFORM_KEY; @@ -1186,12 +1186,8 @@ bool LLAppViewer::init() { LL_WARNS("InitInfo") << "Skipping updater check." << LL_ENDL; } +#endif //LL_RELEASE_FOR_DOWNLOAD - if (mUpdaterNotFound) - { - LL_WARNS("InitInfo") << "Failed to launch updater. Skipping Leap commands." << LL_ENDL; - } - else { // 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. @@ -1224,7 +1220,6 @@ bool LLAppViewer::init() << "lleventhost no longer supported as a dynamic library" << LL_ENDL; } -#endif //LL_RELEASE_FOR_DOWNLOAD LLTextUtil::TextHelpers::iconCallbackCreationFunction = create_text_segment_icon_from_url_match; |