From f9a6f4d0beef55f8908d905873a47c96702814ee Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sat, 15 Jul 2017 15:47:36 +0200
Subject: [PATCH] Improve previously added check (HUD attachments can be made
 visible at any time)

---
 indra/newview/llviewermenu.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 302d2a5f49..f5d077c039 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -10405,7 +10405,7 @@ class LLViewCheckHUDAttachments : public view_listener_t
 // <FS:Ansariel> Disable Show HUD attachments if prevented by RLVa
 bool enable_show_HUD_attachments()
 {
-	return (!rlv_handler_t::isEnabled() || !gRlvAttachmentLocks.hasLockedHUD());
+	return (!LLPipeline::sShowHUDAttachments || !rlv_handler_t::isEnabled() || !gRlvAttachmentLocks.hasLockedHUD());
 };
 // </FS:Ansariel>