diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-05-21 10:17:34 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-05-21 10:17:34 -0700 |
| commit | 78e62fe0f16d95a2afb6c4205b121db189c297b9 (patch) | |
| tree | ec509ca6b2c721c65c6d81d978732267e2ce21c5 /indra/newview/llappviewer.cpp | |
| parent | b07a8f7033dae6250e144aca4c274d935b648cf7 (diff) | |
| parent | 2672194b1d3eb03648861a29e57d81a38f527746 (diff) | |
Merge viewer-release 6.2.3
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 63eb6d25e1..500efa24c4 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1143,6 +1143,7 @@ bool LLAppViewer::init() gGLActive = FALSE; +#if LL_RELEASE_FOR_DOWNLOAD if (!gSavedSettings.getBOOL("CmdLineSkipUpdater")) { LLProcess::Params updater; @@ -1208,6 +1209,7 @@ bool LLAppViewer::init() << "lleventhost no longer supported as a dynamic library" << LL_ENDL; } +#endif LLViewerMedia::initClass(); LL_INFOS("InitInfo") << "Viewer media initialized." << LL_ENDL ; @@ -3107,17 +3109,11 @@ LLSD LLAppViewer::getViewerInfo() const } // return a URL to the release notes for this viewer, such as: - // http://wiki.secondlife.com/wiki/Release_Notes/Second Life Beta Viewer/2.1.0.123456 + // https://releasenotes.secondlife.com/viewer/2.1.0.123456.html std::string url = LLTrans::getString("RELEASE_NOTES_BASE_URL"); if (! LLStringUtil::endsWith(url, "/")) url += "/"; - std::string channel = LLVersionInfo::getChannel(); - if (LLStringUtil::endsWith(boost::to_lower_copy(channel), " edu")) // Release Notes url shouldn't include the EDU parameter - { - boost::erase_tail(channel, 4); - } - url += LLURI::escape(channel) + "/"; - url += LLURI::escape(LLVersionInfo::getVersion()); + url += LLURI::escape(LLVersionInfo::getVersion()) + ".html"; info["VIEWER_RELEASE_NOTES_URL"] = url; |