diff options
author | McCabe Maxsted | 2009-09-12 17:52:25 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-09-12 17:52:25 -0700 |
commit | 176447bb61e16eaedad595420fffef67c595cdcc (patch) | |
tree | b0b3e3ce2078a8b7f252d28bd0f4b13c91037956 /linden/indra/newview/llpanelavatar.cpp | |
parent | Applied patch by Latif Khalifa for VWR-5370 (Detached Contacts panel cannot b... (diff) | |
download | meta-impy-176447bb61e16eaedad595420fffef67c595cdcc.zip meta-impy-176447bb61e16eaedad595420fffef67c595cdcc.tar.gz meta-impy-176447bb61e16eaedad595420fffef67c595cdcc.tar.bz2 meta-impy-176447bb61e16eaedad595420fffef67c595cdcc.tar.xz |
Applied and modified Emerald viewer feature that shows what groups are hidden in your profile
Diffstat (limited to 'linden/indra/newview/llpanelavatar.cpp')
-rw-r--r-- | linden/indra/newview/llpanelavatar.cpp | 39 |
1 files changed, 37 insertions, 2 deletions
diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp index 682a56f..fa1883d 100644 --- a/linden/indra/newview/llpanelavatar.cpp +++ b/linden/indra/newview/llpanelavatar.cpp | |||
@@ -1535,9 +1535,18 @@ void LLPanelAvatar::resetGroupList() | |||
1535 | LLSD row; | 1535 | LLSD row; |
1536 | 1536 | ||
1537 | row["id"] = id ; | 1537 | row["id"] = id ; |
1538 | row["columns"][0]["value"] = group_string; | ||
1539 | row["columns"][0]["font"] = "SANSSERIF_SMALL"; | 1538 | row["columns"][0]["font"] = "SANSSERIF_SMALL"; |
1540 | row["columns"][0]["width"] = 0; | 1539 | row["columns"][0]["width"] = 0; |
1540 | if (group_data.mListInProfile) | ||
1541 | { | ||
1542 | row["columns"][0]["value"] = group_string; | ||
1543 | row["columns"][0]["color"] = gColors.getColor("ScrollUnselectedColor").getValue(); | ||
1544 | } | ||
1545 | else | ||
1546 | { | ||
1547 | row["columns"][0]["value"] = group_string + " " + getString("HiddenLabel"); | ||
1548 | row["columns"][0]["color"] = gColors.getColor("ScriptBgReadOnlyColor").getValue(); | ||
1549 | } | ||
1541 | group_list->addElement(row); | 1550 | group_list->addElement(row); |
1542 | } | 1551 | } |
1543 | group_list->sortByColumnIndex(0, TRUE); | 1552 | group_list->sortByColumnIndex(0, TRUE); |
@@ -2014,8 +2023,34 @@ void LLPanelAvatar::processAvatarGroupsReply(LLMessageSystem *msg, void**) | |||
2014 | 2023 | ||
2015 | LLSD row; | 2024 | LLSD row; |
2016 | row["id"] = group_id; | 2025 | row["id"] = group_id; |
2017 | row["columns"][0]["value"] = group_string; | ||
2018 | row["columns"][0]["font"] = "SANSSERIF_SMALL"; | 2026 | row["columns"][0]["font"] = "SANSSERIF_SMALL"; |
2027 | |||
2028 | LLGroupData *group_data = NULL; | ||
2029 | |||
2030 | if (avatar_id == agent_id) // own avatar | ||
2031 | { | ||
2032 | // Search for this group in the agent's groups list | ||
2033 | LLDynamicArray<LLGroupData>::iterator i; | ||
2034 | for (i = gAgent.mGroups.begin(); i != gAgent.mGroups.end(); i++) | ||
2035 | { | ||
2036 | if (i->mID == group_id) | ||
2037 | { | ||
2038 | group_data = &*i; | ||
2039 | break; | ||
2040 | } | ||
2041 | } | ||
2042 | } | ||
2043 | // Set normal color if not found or if group is visible in profile | ||
2044 | if (!group_data || group_data->mListInProfile) | ||
2045 | { | ||
2046 | row["columns"][0]["value"] = group_string; | ||
2047 | row["columns"][0]["color"] = gColors.getColor("ScrollUnselectedColor").getValue(); | ||
2048 | } | ||
2049 | else | ||
2050 | { | ||
2051 | row["columns"][0]["value"] = group_string + " " + self->getString("HiddenLabel"); | ||
2052 | row["columns"][0]["color"] = gColors.getColor("ScriptBgReadOnlyColor").getValue(); | ||
2053 | } | ||
2019 | if (group_list) | 2054 | if (group_list) |
2020 | { | 2055 | { |
2021 | group_list->addElement(row); | 2056 | group_list->addElement(row); |