livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Display FS CEF info if we can.

master
Nicky 2016-02-08 22:23:48 +01:00
parent 848d6c6938
commit 70552e8ac7
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llappviewer.cpp
View File

@ -142,7 +142,7 @@
#include "llcoros.h"
//<FS:TS> Turn off library for 64-bit OS X too
//#if !LL_LINUX
#if !LL_LINUX && !(LL_DARWIN && defined(ND_BUILD64BIT_ARCH))
#if !(LL_DARWIN && defined(ND_BUILD64BIT_ARCH))
#include "cef/llceflib.h"
#endif
@ -3998,6 +3998,14 @@ LLSD LLAppViewer::getViewerInfo() const
info["LLCEFLIB_VERSION"] = "Undefined";
#endif
#if defined( FS_CEFLIB_VERSION ) && FS_CEFLIB_VERSION >= 6
{
std::stringstream strm;
strm << LLCEFLIB_BASE_VERSION << ".FS" << FS_CEFLIB_VERSION << "-" << FS_CEF_VERSION << " (Chrome " << FS_CEF_CHROME_VERSION << ")";
info[ "LLCEFLIB_VERSION" ] = strm.str();
}
#endif
// <FS:ND> Use the total accumulated samples.
//S32 packets_in = LLViewerStats::instance().getRecording().getSum(LLStatViewer::PACKETS_IN);
//if (packets_in > 0)