diff options
| author | Callum Prentice <callum@gmail.com> | 2017-03-14 12:37:52 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2017-03-14 12:37:52 -0700 |
| commit | 062c345556ef74d33f6cdcaaae513211ced7c410 (patch) | |
| tree | 712055b92bfd62ffde50ac4f2c041d926a7bdfe6 /indra | |
| parent | 978335002606f68128d5ae3cba46f87216b082ea (diff) | |
Tweak CEF plugin version to include Chrome equivalent
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 7 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index b58af54985..ff54977634 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3393,8 +3393,13 @@ LLSD LLAppViewer::getViewerInfo() const cef_ver_codec << DULLAHAN_VERSION_MINOR; cef_ver_codec << "."; cef_ver_codec << DULLAHAN_VERSION_BUILD; - cef_ver_codec << " - CEF: "; + + cef_ver_codec << " / CEF: "; cef_ver_codec << CEF_VERSION; + + cef_ver_codec << " / Chrome: "; + cef_ver_codec << CHROME_VERSION_MAJOR; + info["LIBCEF_VERSION"] = cef_ver_codec.str(); #else info["LIBCEF_VERSION"] = "Undefined"; diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 2ae78901f6..9533407c51 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -61,7 +61,7 @@ VFS (cache) creation time: [VFS_TIME] <string name="AboutLibs"> J2C Decoder Version: [J2C_VERSION] Audio Driver Version: [AUDIO_DRIVER_VERSION] -CEF Version: [LIBCEF_VERSION] +[LIBCEF_VERSION] LibVLC Version: [LIBVLC_VERSION] Voice Server Version: [VOICE_VERSION] </string> |