From ffb741f862c9bc3c072bb2c63fb93707940d1d97 Mon Sep 17 00:00:00 2001 From: James Cook Date: Wed, 17 Feb 2010 09:48:43 -0800 Subject: DEV-46233 From field in group notices table contains SLID with Resident Raw name being sent from server --- indra/newview/llpanelgroupnotices.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/llpanelgroupnotices.cpp') diff --git a/indra/newview/llpanelgroupnotices.cpp b/indra/newview/llpanelgroupnotices.cpp index 6210973dae..849afce34d 100644 --- a/indra/newview/llpanelgroupnotices.cpp +++ b/indra/newview/llpanelgroupnotices.cpp @@ -36,6 +36,7 @@ #include "llview.h" +#include "llcachename.h" #include "llinventory.h" #include "llviewerinventory.h" #include "llinventoryfunctions.h" @@ -533,6 +534,9 @@ void LLPanelGroupNotices::processNotices(LLMessageSystem* msg) msg->getU8("Data","AssetType",asset_type,i); msg->getU32("Data","Timestamp",timestamp,i); + // IDEVO clean up legacy "Resident" names + name = LLCacheName::cleanFullName(name); + LLSD row; row["id"] = id; -- cgit v1.2.3 From 6cb420b20bd509e7bf62c8450f12d433c5a81be2 Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Thu, 27 May 2010 15:12:03 -0700 Subject: added function for building a username from a legacy name and fixed group notice panel reviewed by James --- indra/newview/llpanelgroupnotices.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llpanelgroupnotices.cpp') diff --git a/indra/newview/llpanelgroupnotices.cpp b/indra/newview/llpanelgroupnotices.cpp index 2a955004e9..b71ece2be3 100644 --- a/indra/newview/llpanelgroupnotices.cpp +++ b/indra/newview/llpanelgroupnotices.cpp @@ -548,8 +548,8 @@ void LLPanelGroupNotices::processNotices(LLMessageSystem* msg) msg->getU8("Data","AssetType",asset_type,i); msg->getU32("Data","Timestamp",timestamp,i); - // IDEVO clean up legacy "Resident" names - name = LLCacheName::cleanFullName(name); + // we only have the legacy name here, convert it to a username + name = LLCacheName::buildUsername(name); LLSD row; row["id"] = id; -- cgit v1.2.3 From 9bb097000cdd38f3af5152ba81731ff093865ffe Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Thu, 27 May 2010 15:49:22 -0700 Subject: update group notice panel and group notice to optionally use username if using display names --- indra/newview/llpanelgroupnotices.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'indra/newview/llpanelgroupnotices.cpp') diff --git a/indra/newview/llpanelgroupnotices.cpp b/indra/newview/llpanelgroupnotices.cpp index b71ece2be3..4e8f0b5448 100644 --- a/indra/newview/llpanelgroupnotices.cpp +++ b/indra/newview/llpanelgroupnotices.cpp @@ -36,7 +36,7 @@ #include "llview.h" -#include "llcachename.h" +#include "llavatarnamecache.h" #include "llinventory.h" #include "llviewerinventory.h" #include "llinventorydefines.h" @@ -549,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); + if (LLAvatarNameCache::useDisplayNames()) + { + name = LLCacheName::buildUsername(name); + } LLSD row; row["id"] = id; -- cgit v1.2.3