summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorRye Cogtail <rye@lindenlab.com>2024-10-01 02:15:51 -0400
committerRye Cogtail <rye@lindenlab.com>2024-10-01 02:15:51 -0400
commit6008ae09c5ca88fae55fc0a010d24b475f9e03f0 (patch)
treee2f7cdc5e5d64ee1d92318aceb7a2b87d3a04b84 /indra
parent5112aa396db2b3eac15970f65b9c5fb149fd8ce1 (diff)
Fix display of CEF version in about floater on linux
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llappviewer.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index a4351fd350..6fd58ef1be 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -135,8 +135,8 @@
#include "stringize.h"
#include "llcoros.h"
#include "llexception.h"
-#if !LL_LINUX
#include "cef/dullahan_version.h"
+#if !LL_LINUX
#include "vlc/libvlc_version.h"
#endif // LL_LINUX
@@ -3438,7 +3438,6 @@ LLSD LLAppViewer::getViewerInfo() const
info["VOICE_VERSION"] = LLTrans::getString("NotConnected");
}
-#if !LL_LINUX
std::ostringstream cef_ver_codec;
cef_ver_codec << "Dullahan: ";
cef_ver_codec << DULLAHAN_VERSION_MAJOR;
@@ -3464,9 +3463,6 @@ LLSD LLAppViewer::getViewerInfo() const
cef_ver_codec << CHROME_VERSION_PATCH;
info["LIBCEF_VERSION"] = cef_ver_codec.str();
-#else
- info["LIBCEF_VERSION"] = "Undefined";
-#endif
#if !LL_LINUX
std::ostringstream vlc_ver_codec;