diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-06-24 01:19:28 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-06-24 01:19:28 +0000 |
| commit | 6362aa300766484909cdfc8884edf3e6744fc727 (patch) | |
| tree | 34f724b3aaa4dbdefe8fe79fd11370f9242596b3 /indra/newview/llappviewer.cpp | |
| parent | bad9314c30be88a5021f953a4aa88e68b5b094f3 (diff) | |
| parent | cb9ce206a9d8d47c32244501f916bb79de753610 (diff) | |
Merged in merge-6.4.5 (pull request #170)
Merge master 6.4.5 into DRTVWR-510
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index ff921dcfdb..7c0124322c 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -129,7 +129,7 @@ #include "llcoros.h" #include "llexception.h" #if !LL_LINUX -#include "cef/dullahan.h" +#include "cef/dullahan_version.h" #include "vlc/libvlc_version.h" #endif // LL_LINUX @@ -3218,12 +3218,16 @@ LLSD LLAppViewer::getViewerInfo() const cef_ver_codec << "."; cef_ver_codec << DULLAHAN_VERSION_MINOR; cef_ver_codec << "."; + cef_ver_codec << DULLAHAN_VERSION_POINT; + cef_ver_codec << "."; cef_ver_codec << DULLAHAN_VERSION_BUILD; - cef_ver_codec << " / CEF: "; + cef_ver_codec << std::endl; + cef_ver_codec << " CEF: "; cef_ver_codec << CEF_VERSION; - cef_ver_codec << " / Chromium: "; + cef_ver_codec << std::endl; + cef_ver_codec << " Chromium: "; cef_ver_codec << CHROME_VERSION_MAJOR; cef_ver_codec << "."; cef_ver_codec << CHROME_VERSION_MINOR; |