diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-09-03 15:30:16 +0100 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-09-03 15:30:16 +0100 |
| commit | 0a74d1593513dc3209fdb29a8dc56b2794b36a29 (patch) | |
| tree | 1af644fe9ad3c62999c177ae37cbeff2ffe19d62 /indra/newview/llfloatergodtools.h | |
| parent | ce1a0c6bafad092f9687e3b5a6b4865569d96863 (diff) | |
| parent | 54b9992eaefe2b68d16a6264c1901f12612e99dc (diff) | |
Merge between james/viewer-identity-evolution and dessie/viewer-public
Diffstat (limited to 'indra/newview/llfloatergodtools.h')
| -rw-r--r-- | indra/newview/llfloatergodtools.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloatergodtools.h b/indra/newview/llfloatergodtools.h index aee9db78a3..438f1024ce 100644 --- a/indra/newview/llfloatergodtools.h +++ b/indra/newview/llfloatergodtools.h @@ -41,6 +41,7 @@ #include "llpanel.h" #include <vector> +class LLAvatarName; class LLButton; class LLCheckBoxCtrl; class LLComboBox; @@ -231,7 +232,7 @@ public: void onChangeAnything(); void onApplyChanges(); void onClickSet(); - void callbackAvatarID(const std::vector<std::string>& names, const uuid_vec_t& ids); + void callbackAvatarID(const uuid_vec_t& ids, const std::vector<LLAvatarName> names); void onClickDeletePublicOwnedBy(); void onClickDeleteAllScriptedOwnedBy(); void onClickDeleteAllOwnedBy(); |