summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorGlenn Glazer <coyot@lindenlab.com>2017-03-21 07:10:11 -0700
committerGlenn Glazer <coyot@lindenlab.com>2017-03-21 07:10:11 -0700
commit0f245dea042f7443e9208ef7106da716a44539c5 (patch)
tree75cb94a32d6c8a055e2c0bbef7da1f4d5882837f /indra/newview/llappviewer.cpp
parent4992654682255a6cace1c5ee86b4b8bf28fde15d (diff)
parent71ffed27c77e787cafe04ddf19df27495255cae5 (diff)
pull from V64 gate
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r--indra/newview/llappviewer.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index b4cb094877..5e1658590d 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3158,8 +3158,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";