diff options
| author | Rye Mutt <rye@lindenlab.com> | 2024-10-01 12:48:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-01 12:48:43 -0400 |
| commit | 59ed2d55a1d84ecf879ff564aaf02744f2dc7c7a (patch) | |
| tree | 04f08cc06a0a4135054015e40a7dbcae182a9f25 /indra/newview/llappviewer.cpp | |
| parent | 0e0b9eb3b397b213bc6f268eb1690c4794cf3ed3 (diff) | |
| parent | 56fbc6a87ff807fd2be3607cd2ca423030032c5b (diff) | |
Merge pull request #2751 from RyeMutt/rye/continued-sdl-cleanup
Clean up SDL input capture and various small linux fixes
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 6 |
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; |