Merge branch 'DRTVWR-476' into DRTVWR-501-maint

1 files changed, 2 insertions, 18 deletions

diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 3cd0932d9c..6d20dcf188 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2304,29 +2304,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;
     }
 }