From ee2ee517d3c908f3febf60e467d08c5a1ee3ec1c Mon Sep 17 00:00:00 2001
From: XenHat <commits@xenh.at>
Date: Thu, 15 Jul 2021 03:04:25 +0000
Subject: [PATCH] Nametag status tweaks
---
indra/newview/llvoavatar.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 7cd59e24e00..b4241e1e2f3 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -3129,7 +3129,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
}
// [/RLVa:KB]
BOOL visible_avatar = isVisible() || mNeedsAnimUpdate;
- static const LLCachedControl<bool> use_chat_bubble(gSavedSettings, "UseChatBubbles"); // seconds
+ static const LLCachedControl<bool> use_chat_bubble(gSavedSettings, "UseChatBubbles");
BOOL visible_chat = use_chat_bubble && (mChats.size() || mTyping);
BOOL render_name = visible_chat ||
(visible_avatar &&
@@ -3266,6 +3266,7 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
// [/RLVa:KB]
bool is_cloud = getIsCloud();
static LLCachedControl<bool> sShowTyping(gSavedSettings, "AlchemyNearbyTypingIndicators", true);
+ static LLCachedControl<bool> use_chat_bubble(gSavedSettings, "UseChatBubbles");
bool is_typing = sShowTyping && mTyping;
if (is_appearance != mNameAppearance)
@@ -3297,7 +3298,7 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
clearNameTag();
- if (is_away || is_muted || is_do_not_disturb || is_appearance || is_typing)
+ if (is_away || is_muted || is_do_not_disturb || is_appearance || (is_typing && !use_chat_bubble))
{
std::string line;
if (is_away)
--
GitLab