summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelblockedlist.h
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-04-07 13:37:37 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-04-07 13:37:37 +0100
commit988d797b31acd3ecd2a396e5679dd7e74104f855 (patch)
treeed76f69f1dced3ff5072ecc0ed081f983a67f97e /indra/newview/llpanelblockedlist.h
parentb5e12269e18bc9074b96f115085d5540ef1d7545 (diff)
parentadce2ecdf8f3a0efcd4907699d286012124ac496 (diff)
merge from viewer-trunk
Diffstat (limited to 'indra/newview/llpanelblockedlist.h')
-rw-r--r--indra/newview/llpanelblockedlist.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelblockedlist.h b/indra/newview/llpanelblockedlist.h
index 1ef16a02f4..a100577e43 100644
--- a/indra/newview/llpanelblockedlist.h
+++ b/indra/newview/llpanelblockedlist.h
@@ -78,7 +78,7 @@ private:
void onPickBtnClick();
void onBlockByNameClick();
- void callbackBlockPicked(const std::vector<std::string>& names, const std::vector<LLUUID>& ids);
+ void callbackBlockPicked(const std::vector<std::string>& names, const uuid_vec_t& ids);
static void callbackBlockByName(const std::string& text);
private: