From 1c68c3786d89221be5ded7409818fad19a51d9f8 Mon Sep 17 00:00:00 2001
From: XenHat <me@xenh.at>
Date: Mon, 8 Jan 2024 22:43:40 -0500
Subject: [PATCH] Fix menu/navbar re-appearing after exiting mouselook in
cinematic mode
---
indra/newview/llagentcamera.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp
index 7e8808c1b82..8bdc00c14da 100644
--- a/indra/newview/llagentcamera.cpp
+++ b/indra/newview/llagentcamera.cpp
@@ -57,6 +57,8 @@
// [/RLVa:KB]
#include "llnotificationsutil.h"
+#include "alcinematicmode.h"
+
using namespace LLAvatarAppearanceDefines;
extern LLMenuBarGL* gMenuBarView;
@@ -2482,7 +2484,7 @@ void LLAgentCamera::changeCameraToDefault()
{
changeCameraToThirdPerson();
}
- if (gSavedSettings.getBOOL("HideUIControls"))
+ if (ALCinematicMode::isEnabled() || gSavedSettings.getBOOL("HideUIControls"))
{
gViewerWindow->setUIVisibility(false);
LLPanelStandStopFlying::getInstance()->setVisible(false);
--
GitLab