diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 5fa66c36041e0616449ed651d62c89224d8fd2d5..46f85bddd400f7f0f51bb4057dd8507623dc5d08 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3359,7 +3359,6 @@ std::string LLAppViewer::getViewerInfoString(bool default_string) const support << "\n" << LLTrans::getString("AboutOGL", args, default_string); support << "\n\n" << LLTrans::getString("AboutSettings", args, default_string); support << "\n\n" << LLTrans::getString("AboutLibs", args, default_string); - support << "\n"; if (info.has("COMPILER")) { diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index 0862084fe35458eeba2a7121680d16939d761f40..3bed8f078195b0676e34a8bd23131b0337780729 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -45,38 +45,6 @@ RestrainedLove API: [RLV_VERSION] height="25" width="180" /> </panel> - <panel - border="true" - label="Credits" - help_topic="about_credits_tab" - name="credits_panel"> - <text - follows="top|left|right" - height="20" - layout="topleft" - left="5" - name="linden_intro" - top="10" - width="465" - wrap="true"> -Second Life is brought to you by the Lindens, -with open source contributions from: - </text> - <text_editor - enabled="false" - follows="top|left" - height="340" - bg_readonly_color="Transparent" - left="5" - text_color="LtGray" - max_length="65536" - name="contrib_names" - top_pad="10" - width="465" - word_wrap="true"> -Dummy Name replaced at run time - </text_editor> - </panel> <panel border="true" label="Licenses" @@ -124,6 +92,38 @@ All rights reserved. See licenses.txt for details. Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C) </text_editor> </panel> + <panel + border="true" + label="Linden Credits" + help_topic="about_credits_tab" + name="credits_panel"> + <text + follows="top|left|right" + height="20" + layout="topleft" + left="5" + name="linden_intro" + top="10" + width="465" + wrap="true"> +Second Life is brought to you by the Lindens, +with open source contributions from: + </text> + <text_editor + enabled="false" + follows="top|left" + height="340" + bg_readonly_color="Transparent" + left="5" + text_color="LtGray" + max_length="65536" + name="contrib_names" + top_pad="10" + width="465" + word_wrap="true"> +Dummy Name replaced at run time + </text_editor> + </panel> <panel border="true" label="Alchemy Credits" @@ -151,8 +151,8 @@ Alchemy Viewer is brought to you by the Alchemy Development Group: top_pad="10" width="435" word_wrap="true"> -Sovereign Engineer, Cinder Roxley, Inusaito Kanya, Luminous Luminos, Electron Electricteeth - </text_editor> +Sovereign Engineer, Luminous Luminos, Cinder Roxley, Inusaito Kanya +</text_editor> <text follows="top|left" height="10" @@ -175,7 +175,7 @@ with open source code from: top_pad="12" width="435" word_wrap="true"> -Siana Gearz, Shyotl Kuhr, Xenhat Liamano, NiranV Dean, Qarl Fizz, TheDarkest Fairey, Tofu Buzzard, Ansariel Hiller, Kitty Barnett, Ayamo Nozaki +Siana Gearz, Shyotl Kuhr, Xenhat Liamano, NiranV Dean, Qarl Fizz, TheDarkest Fairey, Tofu Buzzard, Ansariel Hiller, Kitty Barnett, Ayamo Nozaki, Nicky Dasmijn, Testicular Slingshot, Electron Electricteeth, Latif Khalifa </text_editor> <text follows="top|left" @@ -198,8 +198,9 @@ and project infrastructure from: top_pad="12" width="435" word_wrap="true"> -Atlassian: Bitbucket, Confluence, Jira, Bamboo -Coverity: Coverity Scan +[https://about.gitlab.com/ GitLab] - The best DevOps platform! +[https://sentry.io/welcome/ Sentry] - Our wonderful crash reporting service provider! +[https://scan.coverity.com/ Coverity] - It helps us fix bugs and find crashes </text_editor> </panel> </tab_container> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 44093b3620373f4efc7c4c365f0161d82e3ba3f9..ed1b29b6958292d24b293e937471e4f16a2b991c 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -308,7 +308,7 @@ Please try logging in again in a minute.</string> <string name="ReleaseNotes">Release Notes</string> <!-- Always mark translate="false" for strings that are nothing but URLs, as they don't need translation. --> - <string name="RELEASE_NOTES_BASE_URL" translate="false">https://wiki.alchemyviewer.org/display/AL/</string> + <string name="RELEASE_NOTES_BASE_URL" translate="false">https://git.alchemyviewer.org/alchemy/alchemy/-/wikis/Release-Notes/</string> <!-- Indicates something is being loaded. Maybe should be merged with RetrievingData --> <string name="LoadingData">Loading...</string>