aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloatergroupinvite.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2008-11-25 19:01:57 -0700
committerJacek Antonelli2008-12-13 22:36:18 -0600
commit56d209c969cfbb505e6863ba7aabe76697e18afe (patch)
tree279eafd2ea55801d62b584952ab6e1713dc653ea /linden/indra/newview/llfloatergroupinvite.cpp
parentVWR-4826 (ability to ignore friendship offers). (diff)
downloadmeta-impy-56d209c969cfbb505e6863ba7aabe76697e18afe.zip
meta-impy-56d209c969cfbb505e6863ba7aabe76697e18afe.tar.gz
meta-impy-56d209c969cfbb505e6863ba7aabe76697e18afe.tar.bz2
meta-impy-56d209c969cfbb505e6863ba7aabe76697e18afe.tar.xz
Add group name to group invite window.
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llfloatergroupinvite.cpp20
1 files changed, 19 insertions, 1 deletions
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 @@
34#include "llfloatergroupinvite.h" 34#include "llfloatergroupinvite.h"
35#include "llpanelgroupinvite.h" 35#include "llpanelgroupinvite.h"
36 36
37const char FLOATER_TITLE[] = "Group Invitation"; 37const char FLOATER_TITLE[] = "Invite to ";
38const LLRect FGI_RECT(0, 380, 210, 0); 38const LLRect FGI_RECT(0, 380, 210, 0);
39 39
40class LLFloaterGroupInvite::impl 40class LLFloaterGroupInvite::impl
@@ -132,6 +132,11 @@ void LLFloaterGroupInvite::showForGroup(const LLUUID& group_id, std::vector<LLUU
132 group_id); 132 group_id);
133 133
134 impl::sInstances[group_id] = fgi; 134 impl::sInstances[group_id] = fgi;
135
136 // Look up the group name.
137 // The callback will insert it into the title.
138 const BOOL is_group = TRUE;
139 gCacheName->get(group_id, is_group, callbackLoadGroupName, NULL);
135 140
136 fgi->mImpl->mInvitePanelp->clear(); 141 fgi->mImpl->mInvitePanelp->clear();
137 } 142 }
@@ -145,3 +150,16 @@ void LLFloaterGroupInvite::showForGroup(const LLUUID& group_id, std::vector<LLUU
145 fgi->open(); /*Flawfinder: ignore*/ 150 fgi->open(); /*Flawfinder: ignore*/
146 fgi->mImpl->mInvitePanelp->update(); 151 fgi->mImpl->mInvitePanelp->update();
147} 152}
153
154void LLFloaterGroupInvite::callbackLoadGroupName(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group, void* data)
155{
156 LLFloaterGroupInvite *fgi = get_if_there(impl::sInstances, id, (LLFloaterGroupInvite*)NULL);
157
158 if (fgi)
159 {
160 // Build a new title including the group name.
161 std::ostringstream title;
162 title << FLOATER_TITLE << first;
163 fgi->setTitle(title.str());
164 }
165}