diff options
author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-10-22 14:27:56 -0700 |
---|---|---|
committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-10-22 14:27:56 -0700 |
commit | b30a0b4bdb8493592ac918b1a8649d7dbb3bae51 (patch) | |
tree | 4688747aca7195cc996451cc4bd376bf1764eb4b /indra/newview/llpanelpeople.cpp | |
parent | be1c9a867440e4306348887ce07c88ba6cd31241 (diff) | |
parent | d3f3dd0998ee8a2159a98d2d8b4b02dce6176252 (diff) |
merge
Diffstat (limited to 'indra/newview/llpanelpeople.cpp')
-rw-r--r-- | indra/newview/llpanelpeople.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp index d096b17145..040b5319b9 100644 --- a/indra/newview/llpanelpeople.cpp +++ b/indra/newview/llpanelpeople.cpp @@ -27,6 +27,7 @@ #include "llviewerprecompiledheaders.h" // libs +#include "llavatarname.h" #include "llfloaterreg.h" #include "llmenugl.h" #include "llnotificationsutil.h" @@ -1150,12 +1151,10 @@ void LLPanelPeople::onActivateButtonClicked() } // static -void LLPanelPeople::onAvatarPicked( - const std::vector<std::string>& names, - const uuid_vec_t& ids) +void LLPanelPeople::onAvatarPicked(const uuid_vec_t& ids, const std::vector<LLAvatarName> names) { if (!names.empty() && !ids.empty()) - LLAvatarActions::requestFriendshipDialog(ids[0], names[0]); + LLAvatarActions::requestFriendshipDialog(ids[0], names[0].getCompleteName()); } void LLPanelPeople::onGroupPlusButtonClicked() |