From 56d209c969cfbb505e6863ba7aabe76697e18afe Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 25 Nov 2008 19:01:57 -0700
Subject: Add group name to group invite window.

---
 linden/indra/newview/llfloatergroupinvite.cpp | 20 +++++++++++++++++++-
 linden/indra/newview/llfloatergroupinvite.h   |  6 ++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

(limited to 'linden/indra/newview')

diff --git a/linden/indra/newview/llfloatergroupinvite.cpp b/linden/indra/newview/llfloatergroupinvite.cpp
index 643abf7..1644050 100644
--- a/linden/indra/newview/llfloatergroupinvite.cpp
+++ b/linden/indra/newview/llfloatergroupinvite.cpp
@@ -34,7 +34,7 @@
 #include "llfloatergroupinvite.h"
 #include "llpanelgroupinvite.h"
 
-const char FLOATER_TITLE[] = "Group Invitation";
+const char FLOATER_TITLE[] = "Invite to ";
 const LLRect FGI_RECT(0, 380, 210, 0);
 
 class LLFloaterGroupInvite::impl
@@ -132,6 +132,11 @@ void LLFloaterGroupInvite::showForGroup(const LLUUID& group_id, std::vector<LLUU
 									   group_id);
 
 		impl::sInstances[group_id] = fgi;
+		
+		// Look up the group name.
+		// The callback will insert it into the title.
+		const BOOL is_group = TRUE;
+		gCacheName->get(group_id, is_group, callbackLoadGroupName, NULL);
 
 		fgi->mImpl->mInvitePanelp->clear();
 	}
@@ -145,3 +150,16 @@ void LLFloaterGroupInvite::showForGroup(const LLUUID& group_id, std::vector<LLUU
 	fgi->open();	/*Flawfinder: ignore*/
 	fgi->mImpl->mInvitePanelp->update();
 }
+
+void LLFloaterGroupInvite::callbackLoadGroupName(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group, void* data)
+{
+	LLFloaterGroupInvite *fgi = get_if_there(impl::sInstances, id, (LLFloaterGroupInvite*)NULL);
+
+	if (fgi)
+	{
+		// Build a new title including the group name.
+		std::ostringstream title;
+		title << FLOATER_TITLE << first;
+		fgi->setTitle(title.str());
+	}
+}
diff --git a/linden/indra/newview/llfloatergroupinvite.h b/linden/indra/newview/llfloatergroupinvite.h
index 621b5dd..96b9161 100644
--- a/linden/indra/newview/llfloatergroupinvite.h
+++ b/linden/indra/newview/llfloatergroupinvite.h
@@ -52,6 +52,12 @@ protected:
 
 	class impl;
 	impl* mImpl;
+private:
+	static void callbackLoadGroupName(const LLUUID& id, 
+				const std::string& first, 
+				const std::string& last, 
+				BOOL is_group, 
+				void* data);
 };
 
 #endif
-- 
cgit v1.1