Henri Beauchamp: Display Names support v4

1 files changed, 27 insertions, 0 deletions

diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 5f333e9..8cb154e 100755
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -2998,6 +2998,33 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 
         if (is_audible)
         {
+                if (chatter && chatter->isAvatar())
+                {
+#ifdef LL_RRINTERFACE_H //MK
+                        if (!gRRenabled || !gAgent.mRRInterface.mContainsShownames)
+                        {
+#endif //mk
+                                if (LLAvatarNameCache::useDisplayNames())
+                                {
+                                        LLAvatarName avatar_name;
+                                        if (LLAvatarNameCache::get(from_id, &avatar_name))
+                                        {
+                                                if (LLAvatarNameCache::useDisplayNames() == 2)
+                                                {
+                                                        from_name = avatar_name.mDisplayName;
+                                                }
+                                                else
+                                                {
+                                                        from_name = avatar_name.getNames();
+                                                }
+                                        }
+                                        chat.mFromName = from_name;
+                                }
+#ifdef LL_RRINTERFACE_H //MK
+                        }
+#endif //mk
+                }
+
                 BOOL visible_in_chat_bubble = FALSE;
                 std::string verb;