synchronous llavatarcachename::get calls now return true even if entry is expired

1 files changed, 8 insertions, 13 deletions

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 0ed7ab835b..5c36792a0d 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -3078,19 +3078,14 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 		// I don't know if it's OK to change this here, if 
 		// anything downstream does lookups by name, for instance
 		
-		if (LLAvatarNameCache::useDisplayNames())
-		{
-			LLAvatarName av_name;
-			LLAvatarNameCache::get(from_id, &av_name);
-
-			if (!av_name.mDisplayName.empty())
-			{
-				chat.mFromName = av_name.mDisplayName;
-			}
-			else
-			{
-				chat.mFromName = LLCacheName::cleanFullName(from_name);
-			}
+		LLAvatarName av_name;

+		if (LLAvatarNameCache::get(from_id, &av_name))

+		{

+			chat.mFromName = av_name.mDisplayName;

+		}

+		else

+		{

+			chat.mFromName = LLCacheName::cleanFullName(from_name);

 		}
 	}
 	else