From d700552b449f3c2bcaee46f61fe3290f57e58fe9 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Tue, 6 Jun 2017 12:51:16 +0300
Subject: [PATCH] MAINT-7458 FIXED Release notes opens every time after any
problem with logining, until viewer will be relaunched.
---
indra/newview/llstartup.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 33b6352bf5..1a480b1838 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2268,13 +2268,15 @@ void login_callback(S32 option, void *userdata)
*/
void show_release_notes_if_required()
{
- if (LLVersionInfo::getChannelAndVersion() != gLastRunVersion
+ static bool release_notes_shown = false;
+ if (!release_notes_shown && (LLVersionInfo::getChannelAndVersion() != gLastRunVersion)
&& LLVersionInfo::getViewerMaturity() != LLVersionInfo::TEST_VIEWER // don't show Release Notes for the test builds
&& gSavedSettings.getBOOL("UpdaterShowReleaseNotes")
&& !gSavedSettings.getBOOL("FirstLoginThisInstall"))
{
LLSD info(LLAppViewer::instance()->getViewerInfo());
LLWeb::loadURLInternal(info["VIEWER_RELEASE_NOTES_URL"]);
+ release_notes_shown = true;
}
}
--
GitLab