summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2017-06-06 12:51:16 +0300
committerMnikolenko Productengine <mnikolenko@productengine.com>2017-06-06 12:51:16 +0300
commitd700552b449f3c2bcaee46f61fe3290f57e58fe9 (patch)
tree6ff82125e8b6afc8249378d76e07e73c547d784e /indra/newview
parent81f4da646800e2a1b7218397290183144f6aed92 (diff)
MAINT-7458 FIXED Release notes opens every time after any problem with logining, until viewer will be relaunched.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llstartup.cpp4
1 files changed, 3 insertions, 1 deletions
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;
}
}