diff options
author | Richard Linden <none@none> | 2014-02-12 10:32:02 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2014-02-12 10:32:02 -0800 |
commit | 5866bb7ef09b786f8f195770a70dc4289d183ca0 (patch) | |
tree | 0be3b5e63506bf30edd3748f9e31740ae9ebbaa8 /indra/newview/llgrouplist.cpp | |
parent | 413be91cf5044889ade97dcbec4b17fceff122e3 (diff) | |
parent | a8192fbf60540e42dcff5f1efb8bf8cafbfac484 (diff) |
merge with release
Diffstat (limited to 'indra/newview/llgrouplist.cpp')
-rwxr-xr-x | indra/newview/llgrouplist.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llgrouplist.cpp b/indra/newview/llgrouplist.cpp index aba3d74d87..b1b7a87ae8 100755 --- a/indra/newview/llgrouplist.cpp +++ b/indra/newview/llgrouplist.cpp @@ -163,7 +163,7 @@ static bool findInsensitive(std::string haystack, const std::string& needle_uppe void LLGroupList::refresh() { const LLUUID& highlight_id = gAgent.getGroupID(); - S32 count = gAgent.mGroups.count(); + S32 count = gAgent.mGroups.size(); LLUUID id; bool have_filter = !mNameFilter.empty(); @@ -171,8 +171,8 @@ void LLGroupList::refresh() for(S32 i = 0; i < count; ++i) { - id = gAgent.mGroups.get(i).mID; - const LLGroupData& group_data = gAgent.mGroups.get(i); + id = gAgent.mGroups.at(i).mID; + const LLGroupData& group_data = gAgent.mGroups.at(i); if (have_filter && !findInsensitive(group_data.mName, mNameFilter)) continue; addNewItem(id, group_data.mName, group_data.mInsigniaID, ADD_BOTTOM); |