diff options
| author | Callum Prentice <callum@lindenlab.com> | 2015-10-02 12:28:33 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2015-10-02 12:28:33 -0700 |
| commit | ce1ad1431fd46d5eacf0f1b3e139823727774ca8 (patch) | |
| tree | 9038e76320bbd2a90d274173796fc376b269c29a /indra/newview/llappviewer.cpp | |
| parent | d68721d2533bcc5f88a43980530d0c324356c473 (diff) | |
| parent | 2fc42c1221393161fcd882b6bb73a7a6da9d07e2 (diff) | |
Merged in rider_linden/viewer-cef (pull request #2)
MAINT-5687: Remove old webkit from the make files and the repo.MAINT-56
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rwxr-xr-x | indra/newview/llappviewer.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 663f1a3550..68976dcfe3 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -124,7 +124,9 @@ #include "llleap.h" #include "stringize.h" #include "llcoros.h" +#if !LL_LINUX #include "cef/llceflib.h" +#endif // Third party library includes #include <boost/bind.hpp> @@ -3370,7 +3372,11 @@ LLSD LLAppViewer::getViewerInfo() const info["VOICE_VERSION"] = LLTrans::getString("NotConnected"); } +#if !LL_LINUX info["LLCEFLIB_VERSION"] = LLCEFLIB_VERSION; +#else + info["LLCEFLIB_VERSION"] = "Undefined"; +#endif S32 packets_in = LLViewerStats::instance().getRecording().getSum(LLStatViewer::PACKETS_IN); if (packets_in > 0) |