summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelgroupnotices.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-04-01 14:24:01 -0400
committerOz Linden <oz@lindenlab.com>2013-04-01 14:24:01 -0400
commit2fde4a9ae55a8641a5a7a9091af4d598b7e8d847 (patch)
tree1ffa1f6a643579fd32da5fc241f03a5fdd2cbf42 /indra/newview/llpanelgroupnotices.cpp
parente42142005585f580d39036fba02ec060d739cc5f (diff)
parent7333731bbca764fdac87173fa5a6e5f2bb46c1d2 (diff)
merge changes for 3.5.0-beta7
Diffstat (limited to 'indra/newview/llpanelgroupnotices.cpp')
-rw-r--r--indra/newview/llpanelgroupnotices.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/llpanelgroupnotices.cpp b/indra/newview/llpanelgroupnotices.cpp
index 31c0e3d01a..93b108efcc 100644
--- a/indra/newview/llpanelgroupnotices.cpp
+++ b/indra/newview/llpanelgroupnotices.cpp
@@ -543,10 +543,7 @@ void LLPanelGroupNotices::processNotices(LLMessageSystem* msg)
msg->getU32("Data","Timestamp",timestamp,i);
// we only have the legacy name here, convert it to a username
- if (LLAvatarNameCache::useDisplayNames())
- {
- name = LLCacheName::buildUsername(name);
- }
+ name = LLCacheName::buildUsername(name);
LLSD row;
row["id"] = id;