diff options
author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-07-30 14:34:58 +0300 |
---|---|---|
committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-07-30 14:36:39 +0300 |
commit | 6bafe47e5cd6694c092dfc7cafc97c83046ebd55 (patch) | |
tree | 029ea12a9c11da4560d021ef973c0eb61ea66a72 /indra/newview | |
parent | 77f5a06a1e45f2aeb2f511675bcab7422b6f330d (diff) |
Revert part of SL-11216 due to reverting VVM
This reverts commit 31d9930a0ff7da5a6312a8f47037052cd2d06bdb.
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/llstartup.cpp | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 4b65ead236..38ed022c44 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -2301,29 +2301,13 @@ void login_callback(S32 option, void *userdata) void show_release_notes_if_required() { static bool release_notes_shown = false; - // We happen to know that instantiating LLVersionInfo implicitly - // instantiates the LLEventMailDrop named "relnotes", which we (might) use - // below. If viewer release notes stop working, might be because that - // LLEventMailDrop got moved out of LLVersionInfo and hasn't yet been - // instantiated. if (!release_notes_shown && (LLVersionInfo::instance().getChannelAndVersion() != gLastRunVersion) && LLVersionInfo::instance().getViewerMaturity() != LLVersionInfo::TEST_VIEWER // don't show Release Notes for the test builds && gSavedSettings.getBOOL("UpdaterShowReleaseNotes") && !gSavedSettings.getBOOL("FirstLoginThisInstall")) { - // Instantiate a "relnotes" listener which assumes any arriving event - // is the release notes URL string. Since "relnotes" is an - // LLEventMailDrop, this listener will be invoked whether or not the - // URL has already been posted. If so, it will fire immediately; - // otherwise it will fire whenever the URL is (later) posted. Either - // way, it will display the release notes as soon as the URL becomes - // available. - LLEventPumps::instance().obtain("relnotes").listen( - "showrelnotes", - [](const LLSD& url){ - LLWeb::loadURLInternal(url.asString()); - return false; - }); + LLSD info(LLAppViewer::instance()->getViewerInfo()); + LLWeb::loadURLInternal(info["VIEWER_RELEASE_NOTES_URL"]); release_notes_shown = true; } } |