diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-10 17:35:00 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-10 17:35:00 +0300 |
| commit | d0e0da04244b84c6b8588a0cacf17481acac29ef (patch) | |
| tree | 5a90d26f635a617253048a1037bf53843f28791d /indra/newview/llviewermenu.cpp | |
| parent | d5218c05219a6bddb63d752a9df3b5d6fe1e3cf7 (diff) | |
| parent | 48b34e07ef33965edcc38006082be01ed7ed239d (diff) | |
Merge branch 'rlva/base' into feature/rlva
# Conflicts:
# indra/newview/skins/default/xui/en/menu_viewer.xml
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 39aa85beea..10506e0e74 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -151,6 +151,7 @@ #include "llviewershadermgr.h" #include "gltfscenemanager.h" #include "gltf/asset.h" +#include "rlvcommon.h" using namespace LLAvatarAppearanceDefines; @@ -6280,6 +6281,8 @@ void show_debug_menus() gMenuBarView->setItemVisible("Advanced", debug); // gMenuBarView->setItemEnabled("Advanced", debug); // Don't disable Advanced keyboard shortcuts when hidden + Rlv::Util::menuToggleVisible(); + gMenuBarView->setItemVisible("Debug", qamode); gMenuBarView->setItemEnabled("Debug", qamode); |