diff options
author | Monty Brandenberg <monty@lindenlab.com> | 2010-12-09 11:07:50 -0500 |
---|---|---|
committer | Monty Brandenberg <monty@lindenlab.com> | 2010-12-09 11:07:50 -0500 |
commit | b9cf73c29b4b87a391c78415e4c09c31b4ac045c (patch) | |
tree | d843f4e78bc6874001cb81fc993cc59d0a179a83 /indra/newview/llfloatergodtools.h | |
parent | a59c43f1adff35107e59fdfc3016d4329324bbaf (diff) | |
parent | d9b4570883652d647c05083c18fac1a088efd6e2 (diff) |
merge from http://hg.secondlife.com/viewer-development
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 60fc95580f..1aa8b838fb 100644 --- a/indra/newview/llfloatergodtools.h +++ b/indra/newview/llfloatergodtools.h @@ -35,6 +35,7 @@ #include "llpanel.h" #include <vector> +class LLAvatarName; class LLButton; class LLCheckBoxCtrl; class LLComboBox; @@ -225,7 +226,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(); |