From bf65c2f8134445e982a9eb36788b02b76d8d84a6 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sat, 23 Apr 2022 18:04:54 +0200
Subject: [PATCH] CATZ-638: Simplify refreshing the names on a participants
list
---
indra/newview/rlvhandler.cpp | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/indra/newview/rlvhandler.cpp b/indra/newview/rlvhandler.cpp
index b5d49b2826d..1d581374758 100644
--- a/indra/newview/rlvhandler.cpp
+++ b/indra/newview/rlvhandler.cpp
@@ -2607,22 +2607,10 @@ void RlvBehaviourToggleHandler<RLV_BHVR_SHOWNAMES>::onCommandToggle(ERlvBehaviou
// Refresh the nearby participant list
if (LLFloaterIMNearbyChat* pNearbyChatFloater = LLFloaterReg::findTypedInstance<LLFloaterIMNearbyChat>("nearby_chat"))
{
-#ifdef CATZNIP
- // Legacy chat (Catznip)
- if (LLParticipantAvatarList* pParticipantList = dynamic_cast<LLParticipantAvatarList*>(pNearbyChatFloater->getParticipantList()))
- {
- if (LLAvatarList* pAvatarList = pParticipantList->getAvatarList())
- {
- pAvatarList->updateAvatarNames();
- }
- }
-#else
- // CHUI
if (LLParticipantList* pParticipantList = pNearbyChatFloater->getParticipantList())
{
- pParticipantList->reset();
+ pParticipantList->refreshNames();
}
-#endif // CATZNIP
}
// Force the use of the "display name" cache so we can filter both display and legacy names (or return back to the user's preference)
--
GitLab