diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2020-06-23 22:03:43 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2020-06-23 22:03:43 -0400 |
| commit | 77cf4588dfa0213b8166b5575868df75b411a824 (patch) | |
| tree | 101bf94283b5e1967b0458e16ca21e62e80c1361 /indra/newview/llappviewer.cpp | |
| parent | f627140cf11232bab11fdfaf66c78544cf44f3e8 (diff) | |
| parent | c0087286e78098ee246ea821aefb5686ab8bda78 (diff) | |
DRTVWR-476: Merge branch 'master' of lindenlab/viewer into d476
following release of D512.
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 70d3c10524..c1fd09a17b 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 @@ -3190,12 +3190,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; |