From 77ef7b5f2c99ad13cafa18c67a83ccd90b9bf490 Mon Sep 17 00:00:00 2001 From: Cinders Date: Sun, 4 Aug 2013 23:55:23 -0600 Subject: [PATCH] FIRE-11247: Make the group notice list sender's name obey FSNameTagShowLegacyUsernames --- indra/newview/llpanelgroupnotices.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/indra/newview/llpanelgroupnotices.cpp b/indra/newview/llpanelgroupnotices.cpp index 29fbfdeaaa..4a2789df62 100755 --- a/indra/newview/llpanelgroupnotices.cpp +++ b/indra/newview/llpanelgroupnotices.cpp @@ -57,6 +57,8 @@ #include "llnotificationsutil.h" #include "llgiveinventory.h" +#include "llviewercontrol.h" // FIRE-11247 - gSavedSettings + static LLRegisterPanelClassWrapper t_panel_group_notices("panel_group_notices"); @@ -547,7 +549,10 @@ void LLPanelGroupNotices::processNotices(LLMessageSystem* msg) msg->getU32("Data","Timestamp",timestamp,i); // we only have the legacy name here, convert it to a username - name = LLCacheName::buildUsername(name); + // FIRE-11247 - Let the user decide how they want to see names + //name = LLCacheName::buildUsername(name); + name = gSavedSettings.getBOOL("FSNameTagShowLegacyUsernames") ? LLCacheName::buildLegacyName(name) : LLCacheName::buildUsername(name); + // LLSD row; row["id"] = id;