summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatergodtools.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-03-30 18:19:56 +0300
committerVadim Savchuk <vsavchuk@productengine.com>2010-03-30 18:19:56 +0300
commit3e23c04c9b633f947faf8c7c11ed73ad78de8d3c (patch)
treea65e8b51b8622750038e93799274539329c66343 /indra/newview/llfloatergodtools.cpp
parentc73dcb079991bad12458386274cec409013ad76b (diff)
parente1517318c58d6796b5566d5cf96c02474fd7376e (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llfloatergodtools.cpp')
-rw-r--r--indra/newview/llfloatergodtools.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatergodtools.cpp b/indra/newview/llfloatergodtools.cpp
index c08d891d2f..e7b2da043f 100644
--- a/indra/newview/llfloatergodtools.cpp
+++ b/indra/newview/llfloatergodtools.cpp
@@ -1150,7 +1150,7 @@ void LLPanelObjectTools::onClickSetBySelection(void* data)
panelp->childSetValue("target_avatar_name", name);
}
-void LLPanelObjectTools::callbackAvatarID(const std::vector<std::string>& names, const std::vector<LLUUID>& ids)
+void LLPanelObjectTools::callbackAvatarID(const std::vector<std::string>& names, const uuid_vec_t& ids)
{
if (ids.empty() || names.empty()) return;
mTargetAvatar = ids[0];