diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2022-08-24 14:01:16 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2022-08-24 14:01:16 -0400 |
| commit | 96ec4b3a54268416e59fe68e597e5aea4579bd44 (patch) | |
| tree | 79da3df752efc9b38c7bb5549ec112cd4aa8a74a | |
| parent | 65612700f389d453d4817fb3f68429a60ea144b8 (diff) | |
DRTVWR-558: Re-enable --leap command-line switch for dev builds.
The --leap command-line switch is independent of updater processing. It should
NOT be suppressed when the updater is suppressed. --leap is used for viewer
testing, which is important for dev builds!
| -rw-r--r-- | indra/newview/llappviewer.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 60797c87d9..1e62b88dfa 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1185,12 +1185,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. @@ -1223,7 +1219,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; |