Skip to content
Snippets Groups Projects
Commit e84e4a1a authored by callum_linden's avatar callum_linden
Browse files

Fix for MAINT-8177 Expose the full version of the matching Chromium/Chrome...

Fix for MAINT-8177 Expose the full version of the matching Chromium/Chrome build for CEF in the About box
parent 3bd84c2f
No related branches found
No related tags found
No related merge requests found
...@@ -3178,8 +3178,14 @@ LLSD LLAppViewer::getViewerInfo() const ...@@ -3178,8 +3178,14 @@ LLSD LLAppViewer::getViewerInfo() const
cef_ver_codec << " / CEF: "; cef_ver_codec << " / CEF: ";
cef_ver_codec << CEF_VERSION; cef_ver_codec << CEF_VERSION;
cef_ver_codec << " / Chrome: "; cef_ver_codec << " / Chromium: ";
cef_ver_codec << CHROME_VERSION_MAJOR; 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(); info["LIBCEF_VERSION"] = cef_ver_codec.str();
#else #else
......
...@@ -8,14 +8,14 @@ ...@@ -8,14 +8,14 @@
help_topic="floater_about" help_topic="floater_about"
save_rect="true" save_rect="true"
title="ABOUT [CAPITALIZED_APP_NAME]" title="ABOUT [CAPITALIZED_APP_NAME]"
width="470"> width="500">
<tab_container <tab_container
follows="all" follows="all"
top="25" top="25"
left="10" left="10"
height="405" height="405"
width="450" width="480"
name="about_tab" name="about_tab"
tab_position="top"> tab_position="top">
<panel <panel
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
max_length="65536" max_length="65536"
name="support_editor" name="support_editor"
top="5" top="5"
width="435" width="465"
word_wrap="true" /> word_wrap="true" />
<button <button
follows="left|top" follows="left|top"
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
left="5" left="5"
name="linden_intro" name="linden_intro"
top="10" top="10"
width="435" width="465"
wrap="true"> wrap="true">
Second Life is brought to you by the Lindens, Second Life is brought to you by the Lindens,
with open source contributions from: with open source contributions from:
...@@ -71,7 +71,7 @@ with open source contributions from: ...@@ -71,7 +71,7 @@ with open source contributions from:
max_length="65536" max_length="65536"
name="contrib_names" name="contrib_names"
top_pad="10" top_pad="10"
width="435" width="465"
word_wrap="true"> word_wrap="true">
Dummy Name replaced at run time Dummy Name replaced at run time
</text_editor> </text_editor>
...@@ -91,7 +91,7 @@ Dummy Name replaced at run time ...@@ -91,7 +91,7 @@ Dummy Name replaced at run time
max_length="65536" max_length="65536"
name="licenses_editor" name="licenses_editor"
top="5" top="5"
width="435" width="465"
word_wrap="true"> word_wrap="true">
3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion 3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion
APR Copyright (C) 2011 The Apache Software Foundation APR Copyright (C) 2011 The Apache Software Foundation
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment