From 3c249e5d5fca71714d7686c19d093962fbec313e Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Wed, 15 Feb 2017 14:52:33 +0200
Subject: MAINT-7051 Release Notes url shouldn't include the EDU parameter
---
indra/newview/llappviewer.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
(limited to 'indra/newview')
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 5eb82a2d0b..62e32c0bdc 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3312,7 +3312,12 @@ LLSD LLAppViewer::getViewerInfo() const
std::string url = LLTrans::getString("RELEASE_NOTES_BASE_URL");
if (! LLStringUtil::endsWith(url, "/"))
url += "/";
- url += LLURI::escape(LLVersionInfo::getChannel()) + "/";
+ 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());
info["VIEWER_RELEASE_NOTES_URL"] = url;
--
cgit v1.2.3