livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for MAINT-8177 Expose the full version of the matching Chromium/Chrome build for CEF in the About box

meow-7.2.2
callum_linden 2018-01-11 10:32:23 -08:00
parent 3bd84c2f2f
commit e84e4a1adf
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llappviewer.cpp
View File

@ -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

12
indra/newview/skins/default/xui/en/floater_about.xml
View File

@ -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