diff options
| author | Jacek Antonelli | 2009-10-03 04:25:50 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-10-03 04:25:50 -0500 |
| commit | 0a6d84a05ad59d613092b6fd87fc84099df0d160 (patch) | |
| tree | 1e64e2657f764c9c2a015a70d8c1a6d67afc722a /linden/indra/newview/llpanelavatar.cpp | |
| parent | Imprudence 1.2.0 beta released. (diff) | |
| parent | Fixed switched Buy and Create locations in object pie menu (regression) (diff) | |
| download | meta-impy-0a6d84a05ad59d613092b6fd87fc84099df0d160.zip meta-impy-0a6d84a05ad59d613092b6fd87fc84099df0d160.tar.gz meta-impy-0a6d84a05ad59d613092b6fd87fc84099df0d160.tar.bz2 meta-impy-0a6d84a05ad59d613092b6fd87fc84099df0d160.tar.xz | |
Merge remote branch 'mccabe/next' into next
Diffstat (limited to 'linden/indra/newview/llpanelavatar.cpp')
| -rw-r--r-- | linden/indra/newview/llpanelavatar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp index 5fed44c..872c5e7 100644 --- a/linden/indra/newview/llpanelavatar.cpp +++ b/linden/indra/newview/llpanelavatar.cpp | |||
| @@ -1567,7 +1567,7 @@ void LLPanelAvatar::resetGroupList() | |||
| 1567 | else | 1567 | else |
| 1568 | { | 1568 | { |
| 1569 | row["columns"][0]["value"] = group_string + " " + getString("HiddenLabel"); | 1569 | row["columns"][0]["value"] = group_string + " " + getString("HiddenLabel"); |
| 1570 | row["columns"][0]["color"] = gColors.getColor("ScriptBgReadOnlyColor").getValue(); | 1570 | row["columns"][0]["color"] = gColors.getColor("ScrollReadOnlyColor").getValue(); |
| 1571 | } | 1571 | } |
| 1572 | group_list->addElement(row); | 1572 | group_list->addElement(row); |
| 1573 | } | 1573 | } |
| @@ -2086,7 +2086,7 @@ void LLPanelAvatar::processAvatarGroupsReply(LLMessageSystem *msg, void**) | |||
| 2086 | else | 2086 | else |
| 2087 | { | 2087 | { |
| 2088 | row["columns"][0]["value"] = group_string + " " + self->getString("HiddenLabel"); | 2088 | row["columns"][0]["value"] = group_string + " " + self->getString("HiddenLabel"); |
| 2089 | row["columns"][0]["color"] = gColors.getColor("ScriptBgReadOnlyColor").getValue(); | 2089 | row["columns"][0]["color"] = gColors.getColor("ScrollReadOnlyColor").getValue(); |
| 2090 | } | 2090 | } |
| 2091 | if (group_list) | 2091 | if (group_list) |
| 2092 | { | 2092 | { |