diff options
| author | callum_linden <none@none> | 2018-01-11 10:32:23 -0800 |
|---|---|---|
| committer | callum_linden <none@none> | 2018-01-11 10:32:23 -0800 |
| commit | e84e4a1adf29b3a807c9d0c0e4841b5f12ea9756 (patch) | |
| tree | 601e16de09f077f7b9f7d335a3915ba6cd88aee7 | |
| parent | 3bd84c2f2f01e05907a651ebbba5f21ade2bdb44 (diff) | |
Fix for MAINT-8177 Expose the full version of the matching Chromium/Chrome build for CEF in the About box
| -rw-r--r-- | indra/newview/llappviewer.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_about.xml | 12 |
2 files changed, 13 insertions, 7 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index b33b3a6410..e827a728ae 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3178,8 +3178,14 @@ LLSD LLAppViewer::getViewerInfo() const cef_ver_codec << " / CEF: "; cef_ver_codec << CEF_VERSION; - cef_ver_codec << " / Chrome: "; + cef_ver_codec << " / Chromium: "; cef_ver_codec << CHROME_VERSION_MAJOR; + cef_ver_codec << "."; + cef_ver_codec << CHROME_VERSION_MINOR; + cef_ver_codec << "."; + cef_ver_codec << CHROME_VERSION_BUILD; + cef_ver_codec << "."; + cef_ver_codec << CHROME_VERSION_PATCH; info["LIBCEF_VERSION"] = cef_ver_codec.str(); #else diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index 60f36770bb..71f4d81195 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -8,14 +8,14 @@ help_topic="floater_about" save_rect="true" title="ABOUT [CAPITALIZED_APP_NAME]" - width="470"> + width="500"> <tab_container follows="all" top="25" left="10" height="405" - width="450" + width="480" name="about_tab" tab_position="top"> <panel @@ -33,7 +33,7 @@ max_length="65536" name="support_editor" top="5" - width="435" + width="465" word_wrap="true" /> <button follows="left|top" @@ -56,7 +56,7 @@ left="5" name="linden_intro" top="10" - width="435" + width="465" wrap="true"> Second Life is brought to you by the Lindens, with open source contributions from: @@ -71,7 +71,7 @@ with open source contributions from: max_length="65536" name="contrib_names" top_pad="10" - width="435" + width="465" word_wrap="true"> Dummy Name replaced at run time </text_editor> @@ -91,7 +91,7 @@ Dummy Name replaced at run time max_length="65536" name="licenses_editor" top="5" - width="435" + width="465" word_wrap="true"> 3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion APR Copyright (C) 2011 The Apache Software Foundation |