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

Thu, 11 Jan 2018 10:32:23 -0800

author
callum_linden
date
Thu, 11 Jan 2018 10:32:23 -0800
changeset 55060
f4e0eedd5b1d
parent 55059
896189de0d14
child 55061
844198571ed3

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

indra/newview/llappviewer.cpp file | annotate | diff | revisions
indra/newview/skins/default/xui/en/floater_about.xml file | annotate | diff | revisions
     1.1 --- a/indra/newview/llappviewer.cpp	Thu Jan 11 09:07:22 2018 -0800
     1.2 +++ b/indra/newview/llappviewer.cpp	Thu Jan 11 10:32:23 2018 -0800
     1.3 @@ -3178,8 +3178,14 @@
     1.4  	cef_ver_codec << " / CEF: ";
     1.5  	cef_ver_codec << CEF_VERSION;
     1.6  
     1.7 -	cef_ver_codec << " / Chrome: ";
     1.8 +	cef_ver_codec << " / Chromium: ";
     1.9  	cef_ver_codec << CHROME_VERSION_MAJOR;
    1.10 +	cef_ver_codec << ".";
    1.11 +	cef_ver_codec << CHROME_VERSION_MINOR;
    1.12 +	cef_ver_codec << ".";
    1.13 +	cef_ver_codec << CHROME_VERSION_BUILD;
    1.14 +	cef_ver_codec << ".";
    1.15 +	cef_ver_codec << CHROME_VERSION_PATCH;
    1.16  
    1.17  	info["LIBCEF_VERSION"] = cef_ver_codec.str();
    1.18  #else
     2.1 --- a/indra/newview/skins/default/xui/en/floater_about.xml	Thu Jan 11 09:07:22 2018 -0800
     2.2 +++ b/indra/newview/skins/default/xui/en/floater_about.xml	Thu Jan 11 10:32:23 2018 -0800
     2.3 @@ -8,14 +8,14 @@
     2.4   help_topic="floater_about"
     2.5   save_rect="true"
     2.6   title="ABOUT [CAPITALIZED_APP_NAME]"
     2.7 - width="470">
     2.8 + width="500">
     2.9    
    2.10    <tab_container
    2.11      follows="all" 
    2.12      top="25"
    2.13      left="10"
    2.14      height="405" 
    2.15 -    width="450" 
    2.16 +    width="480" 
    2.17      name="about_tab"
    2.18      tab_position="top">
    2.19      <panel
    2.20 @@ -33,7 +33,7 @@
    2.21         max_length="65536"
    2.22         name="support_editor"
    2.23         top="5"
    2.24 -       width="435"
    2.25 +       width="465"
    2.26         word_wrap="true" />
    2.27        <button
    2.28          follows="left|top" 
    2.29 @@ -56,7 +56,7 @@
    2.30            left="5"
    2.31            name="linden_intro"
    2.32            top="10"
    2.33 -          width="435"
    2.34 +          width="465"
    2.35            wrap="true">
    2.36  Second Life is brought to you by the Lindens, 
    2.37  with open source contributions from:
    2.38 @@ -71,7 +71,7 @@
    2.39         max_length="65536"
    2.40         name="contrib_names"
    2.41         top_pad="10"
    2.42 -       width="435"
    2.43 +       width="465"
    2.44         word_wrap="true">
    2.45  Dummy Name replaced at run time
    2.46        </text_editor>
    2.47 @@ -91,7 +91,7 @@
    2.48         max_length="65536"
    2.49         name="licenses_editor"
    2.50         top="5"
    2.51 -       width="435"
    2.52 +       width="465"
    2.53         word_wrap="true">
    2.54          3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion
    2.55          APR Copyright (C) 2011 The Apache Software Foundation

mercurial