diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 8a85e08b0b..5b41abec33 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -142,7 +142,7 @@ #include "llcoros.h" // 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 + // Use the total accumulated samples. //S32 packets_in = LLViewerStats::instance().getRecording().getSum(LLStatViewer::PACKETS_IN); //if (packets_in > 0)