diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-03-16 14:32:12 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-03-16 14:32:12 -0400 |
| commit | 2d921e00634c593c15776727e513a2d0f9795f21 (patch) | |
| tree | 6ad74651d30ef7ce27f4914a398bb4b9d5cb04b6 /indra/newview/llappviewer.cpp | |
| parent | d7f5122ee9e12b5aec14b15517c3a4c0021544ce (diff) | |
| parent | bdecc9cce982ab35ce1d74444515f536e66d4356 (diff) | |
merge CEF update and fixes from callum
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 616e084119..204a19da7f 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3392,8 +3392,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"; |