diff options
| author | Jon Wolk <jwolk@lindenlab.com> | 2007-12-19 00:56:59 +0000 |
|---|---|---|
| committer | Jon Wolk <jwolk@lindenlab.com> | 2007-12-19 00:56:59 +0000 |
| commit | 7dd08303a3ebf9718c2c60a4d94b81d5d7845f8c (patch) | |
| tree | 6195a8585cc7998647afcaec2167e728e4abd3c1 /indra/newview/llfloateravatarpicker.cpp | |
| parent | 4d87303e78c1accde85b217b325e0c08930b0c4c (diff) | |
svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 -> release. Finished product of QAR-134
Diffstat (limited to 'indra/newview/llfloateravatarpicker.cpp')
| -rw-r--r-- | indra/newview/llfloateravatarpicker.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/indra/newview/llfloateravatarpicker.cpp b/indra/newview/llfloateravatarpicker.cpp index a2ea8c2794..8dcd38c0bb 100644 --- a/indra/newview/llfloateravatarpicker.cpp +++ b/indra/newview/llfloateravatarpicker.cpp @@ -189,12 +189,15 @@ void LLFloaterAvatarPicker::onList(LLUICtrl* ctrl, void* userdata) return; } - std::vector<LLScrollListItem*> items = self->mListNames->getAllSelected(); - for (std::vector<LLScrollListItem*>::iterator iter = items.begin(); - iter != items.end(); ++iter) + std::vector<LLScrollListItem*> items = + self->mListNames->getAllSelected(); + for ( + std::vector<LLScrollListItem*>::iterator iter = items.begin(); + iter != items.end(); + ++iter) { LLScrollListItem* item = *iter; - self->mAvatarNames.push_back(item->getColumn(0)->getText()); + self->mAvatarNames.push_back(item->getColumn(0)->getValue().asString()); self->mAvatarIDs.push_back(item->getUUID()); self->childSetEnabled("Select", TRUE); } @@ -225,8 +228,8 @@ void LLFloaterAvatarPicker::doSelectionChange(const std::deque<LLFolderViewItem* mAvatarNames.clear(); childSetEnabled("Select", FALSE); } + BOOL first_calling_card = TRUE; - BOOL first_calling_card = TRUE; std::deque<LLFolderViewItem*>::const_iterator item_it; for (item_it = items.begin(); item_it != items.end(); ++item_it) { |