diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2026-07-16 19:22:02 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2026-07-16 19:22:02 +0300 |
| commit | 72581ab99d2e891821f5266330ecd8a58a277eb7 (patch) | |
| tree | 528629c8943a400bc1a6186b49cdabdb4b8ed507 /indra/newview/llviewermenu.cpp | |
| parent | f5e788b1b4ff5fb45f20ee5fa5daad7cca42069f (diff) | |
| parent | 1577ca1724787fdc0f0317ade3dab8ea3c5df7e7 (diff) | |
Merge branch 'release/26.3' into marchcat/slua-26.3
# Conflicts:
# .github/workflows/build.yaml
# autobuild.xml
# indra/llcommon/llsys.cpp
# indra/llrender/llimagegl.cpp
# indra/llrender/llimagegl.h
# indra/newview/CMakeLists.txt
# indra/newview/featuretable.txt
# indra/newview/featuretable_linux.txt
# indra/newview/featuretable_mac.txt
# indra/newview/llvoavatar.cpp
# indra/newview/llvoiceclient.cpp
# indra/newview/llvoicevivox.cpp
# indra/newview/viewer_manifest.py
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 566389accb..1095f56863 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -127,7 +127,6 @@ #include "llviewerstatsrecorder.h" #include "llvlcomposition.h" #include "llvoavatarself.h" -#include "llvoicevivox.h" #include "llworld.h" #include "llworldmap.h" #include "pipeline.h" |