diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-04-13 14:50:07 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-04-13 14:50:07 -0700 |
| commit | 033b6269593deb370378663354ee2a78eba54387 (patch) | |
| tree | 200c8575c45a2384a8fa2803cd9a724c85057eae /indra/newview/llappviewer.cpp | |
| parent | 7b56db31f91545102744885b4f70c93278e837bd (diff) | |
| parent | 41f4e854732a7c75a813b2e99285cc41bde13e5e (diff) | |
Merge
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 15aaea5011..7e3bfe4b1b 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1945,8 +1945,6 @@ bool LLAppViewer::cleanup() LLAvatarIconIDCache::getInstance()->save(); - LLViewerMedia::saveCookieFile(); - // Stop the plugin read thread if it's running. LLPluginProcessParent::setUseReadThread(false); @@ -3184,8 +3182,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 |