From 95b0421074a9c3f8e926e46ba20b5b1f321adec8 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Sun, 8 Jul 2012 16:09:10 -0500
Subject: [PATCH] Inviting avatar to group via profile now adds that avatar to
 subsequent group invitation popup more reliably.

---
 indra/newview/llpanelgroupinvite.cpp | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/indra/newview/llpanelgroupinvite.cpp b/indra/newview/llpanelgroupinvite.cpp
index bd8cf5551..35f405340 100644
--- a/indra/newview/llpanelgroupinvite.cpp
+++ b/indra/newview/llpanelgroupinvite.cpp
@@ -392,27 +392,9 @@ void LLPanelGroupInvite::addUsers(std::vector<LLUUID>& agent_ids)
 	std::vector<std::string> names;
 	for (S32 i = 0; i < (S32)agent_ids.size(); i++)
 	{
-		LLUUID agent_id = agent_ids[i];
-		LLVOAvatar* avatarp = gObjectList.findAvatar(agent_id);
-		if(avatarp)
-		{
-			std::string fullname;
-			LLNameValue* nvfirst = avatarp->getNVPair("FirstName");
-			LLNameValue* nvlast = avatarp->getNVPair("LastName");
-			if(nvfirst && nvlast)
-			{
-				fullname = std::string(nvfirst->getString()) + " " + std::string(nvlast->getString());
-			}
-			if (!fullname.empty())
-			{
-				names.push_back(fullname);
-			} 
-			else 
-			{
-				llwarns << "llPanelGroupInvite: Selected avatar has no name: " << avatarp->getID() << llendl;
-				names.push_back("(Unknown)");
-			}
-		}
+		std::string name;
+		if(gCacheName->getFullName(agent_ids[i], name))
+			names.push_back(name);
 	}
 	mImplementation->addUsers(names, agent_ids);
 }