diff options
author | Rider Linden <none@none> | 2015-04-15 11:54:18 -0700 |
---|---|---|
committer | Rider Linden <none@none> | 2015-04-15 11:54:18 -0700 |
commit | 109e2db131514de43a2d61da1cc4ee78dc89f858 (patch) | |
tree | 217ca4b42ee516dab39198661e2bc91514a5a8e5 /indra/newview/llfloateravatarpicker.cpp | |
parent | 176d8cd268611e28c07a462df3027f4872456e5a (diff) | |
parent | 82ae214f6a367e17dd335e80e2444cf672108821 (diff) |
Merge
Diffstat (limited to 'indra/newview/llfloateravatarpicker.cpp')
-rwxr-xr-x | indra/newview/llfloateravatarpicker.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloateravatarpicker.cpp b/indra/newview/llfloateravatarpicker.cpp index 513c33e60d..566a3c9cd3 100755 --- a/indra/newview/llfloateravatarpicker.cpp +++ b/indra/newview/llfloateravatarpicker.cpp @@ -348,11 +348,11 @@ void LLFloaterAvatarPicker::populateFriend() for(it = collector.mOnline.begin(); it!=collector.mOnline.end(); it++) { - friends_scroller->addStringUUIDItem(it->first, it->second); + friends_scroller->addStringUUIDItem(it->second, it->first); } for(it = collector.mOffline.begin(); it!=collector.mOffline.end(); it++) { - friends_scroller->addStringUUIDItem(it->first, it->second); + friends_scroller->addStringUUIDItem(it->second, it->first); } friends_scroller->sortByColumnIndex(0, TRUE); } |