aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloatergroupinvite.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:07 -0500
committerJacek Antonelli2008-08-15 23:45:07 -0500
commit8465910c79b8e746e04fd581cca2d60399e569b9 (patch)
treef43fec3e83c46e0d6190dca923d6fb268b52ffdd /linden/indra/newview/llfloatergroupinvite.cpp
parentSecond Life viewer sources 1.18.2.1 (diff)
downloadmeta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.zip
meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.tar.gz
meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.tar.bz2
meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.tar.xz
Second Life viewer sources 1.18.3.2-RC
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llfloatergroupinvite.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/linden/indra/newview/llfloatergroupinvite.cpp b/linden/indra/newview/llfloatergroupinvite.cpp
index a6d81ec..3ff95dc 100644
--- a/linden/indra/newview/llfloatergroupinvite.cpp
+++ b/linden/indra/newview/llfloatergroupinvite.cpp
@@ -107,7 +107,7 @@ LLFloaterGroupInvite::~LLFloaterGroupInvite()
107} 107}
108 108
109// static 109// static
110void LLFloaterGroupInvite::showForGroup(const LLUUID& group_id) 110void LLFloaterGroupInvite::showForGroup(const LLUUID& group_id, std::vector<LLUUID> *agent_ids)
111{ 111{
112 // Make sure group_id isn't null 112 // Make sure group_id isn't null
113 if (group_id.isNull()) 113 if (group_id.isNull())
@@ -131,6 +131,11 @@ void LLFloaterGroupInvite::showForGroup(const LLUUID& group_id)
131 131
132 fgi->mImpl->mInvitePanelp->clear(); 132 fgi->mImpl->mInvitePanelp->clear();
133 } 133 }
134
135 if (agent_ids != NULL)
136 {
137 fgi->mImpl->mInvitePanelp->addUsers(*agent_ids);
138 }
134 139
135 fgi->center(); 140 fgi->center();
136 fgi->open(); /*Flawfinder: ignore*/ 141 fgi->open(); /*Flawfinder: ignore*/