diff options
| author | Ankur Ahlawat <anchor@lindenlab.com> | 2018-04-19 12:57:19 -0700 |
|---|---|---|
| committer | Ankur Ahlawat <anchor@lindenlab.com> | 2018-04-19 12:57:19 -0700 |
| commit | 3c4ca3985a274c519cf9ed6a7bb50ef85aaaa0ac (patch) | |
| tree | b49fc90bf1c4634557972dd48bca10e887c071a5 /indra/newview/llappviewer.cpp | |
| parent | 7c90da6b9ef48757636b04f6401d5ea1dedf85f0 (diff) | |
| parent | 41f4e854732a7c75a813b2e99285cc41bde13e5e (diff) | |
Merged lindenlab/viewer-release into default
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 464e216cf0..eed052b82a 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1940,8 +1940,6 @@ bool LLAppViewer::cleanup() LLAvatarIconIDCache::getInstance()->save(); - LLViewerMedia::saveCookieFile(); - // Stop the plugin read thread if it's running. LLPluginProcessParent::setUseReadThread(false); @@ -3179,8 +3177,14 @@ LLSD LLAppViewer::getViewerInfo() const cef_ver_codec << " / CEF: "; cef_ver_codec << CEF_VERSION; - cef_ver_codec << " / Chrome: "; + cef_ver_codec << " / Chromium: "; cef_ver_codec << CHROME_VERSION_MAJOR; + cef_ver_codec << "."; + cef_ver_codec << CHROME_VERSION_MINOR; + cef_ver_codec << "."; + cef_ver_codec << CHROME_VERSION_BUILD; + cef_ver_codec << "."; + cef_ver_codec << CHROME_VERSION_PATCH; info["LIBCEF_VERSION"] = cef_ver_codec.str(); #else |