From d7aa745b76584822c22d09a32122160d02c6ae87 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 19 Apr 2013 08:38:56 +0200
Subject: [PATCH] Update name in radar if somebody nearby changes their display
 name

---
 indra/newview/fsradar.cpp             |  9 +++++++++
 indra/newview/fsradar.h               |  1 +
 indra/newview/llviewerdisplayname.cpp | 12 ++++++++++++
 3 files changed, 22 insertions(+)

diff --git a/indra/newview/fsradar.cpp b/indra/newview/fsradar.cpp
index 5eb60cdba9..5d4cdd7fb3 100644
--- a/indra/newview/fsradar.cpp
+++ b/indra/newview/fsradar.cpp
@@ -1016,3 +1016,12 @@ void FSRadar::updateNames()
 		it->second->updateName();
 	}
 }
+
+void FSRadar::updateName(const LLUUID& avatar_id)
+{
+	FSRadarEntry* entry = getEntry(avatar_id);
+	if (entry)
+	{
+		entry->updateName();
+	}
+}
\ No newline at end of file
diff --git a/indra/newview/fsradar.h b/indra/newview/fsradar.h
index 8d0d39c67e..5340b83b0d 100644
--- a/indra/newview/fsradar.h
+++ b/indra/newview/fsradar.h
@@ -64,6 +64,7 @@ public:
 	void teleportToAvatar(const LLUUID& targetAv);
 	void requestRadarChannelAlertSync();
 	void updateNames();
+	void updateName(const LLUUID& avatar_id);
 
 	static void	onRadarNameFmtClicked(const LLSD& userdata);
 	static bool	radarNameFmtCheck(const LLSD& userdata);
diff --git a/indra/newview/llviewerdisplayname.cpp b/indra/newview/llviewerdisplayname.cpp
index 5d3fffd993..2fe1e50781 100644
--- a/indra/newview/llviewerdisplayname.cpp
+++ b/indra/newview/llviewerdisplayname.cpp
@@ -39,6 +39,8 @@
 #include "llhttpnode.h"
 #include "llnotificationsutil.h"
 #include "llui.h"					// getLanguage()
+
+#include "fsradar.h"
 #include "lggcontactsets.h"
 #include "llviewercontrol.h"
 
@@ -215,6 +217,16 @@ class LLDisplayNameUpdate : public LLHTTPNode
 		{
 			LLViewerDisplayName::sNameChangedSignal();
 		}
+		// <FS:Ansariel> Update name in radar
+		else
+		{
+			FSRadar* radar = FSRadar::getInstance();
+			if (radar)
+			{
+				radar->updateName(agent_id);
+			}
+		}
+		// </FS:Ansariel>
 	}
 };