diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-08-16 15:43:58 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-08-16 15:43:58 -0400 |
| commit | 01e0b78c595e346bef4e771f9580006dd895367c (patch) | |
| tree | 90160c9edb07baa4fcfd022082608f96b1bfdc06 /indra/newview/llstartup.cpp | |
| parent | 2368c44a8e2b031e5a8ac199923a016915cfe96a (diff) | |
| parent | cf865bb5962a85e2da3414468d6a99ecb5423f97 (diff) | |
merge changes for DRTVWR-439
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 2db1e4c67e..485b88e4c7 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -2267,13 +2267,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; } } |