diff options
| author | McCabe Maxsted | 2009-09-29 00:38:10 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-09-29 00:40:04 -0700 |
| commit | 4848bcd1c547c3fed705f57053fdc10df9855885 (patch) | |
| tree | 02c2b748262b45c59a7bc3ae57435539e10cef67 /linden/indra/newview/llpanelavatar.cpp | |
| parent | Fixed Advanced Sky only toggling once (diff) | |
| download | meta-impy-4848bcd1c547c3fed705f57053fdc10df9855885.zip meta-impy-4848bcd1c547c3fed705f57053fdc10df9855885.tar.gz meta-impy-4848bcd1c547c3fed705f57053fdc10df9855885.tar.bz2 meta-impy-4848bcd1c547c3fed705f57053fdc10df9855885.tar.xz | |
Renamed ScriptBgReadOnlyColor to ScrollReadOnlyColor so we don't lose it in a merge
Diffstat (limited to '')
| -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 | { |