diff options
author | Merov Linden <merov@lindenlab.com> | 2010-11-24 13:57:22 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2010-11-24 13:57:22 -0800 |
commit | 2e46db239fc8587ecb5aafceda2f060fd470cd93 (patch) | |
tree | a1de838836e837ed9e63eb69990437a69bc0ae9b /indra/newview/skins | |
parent | f2194ee5f6ae305b4eaa379168aefecf0aed477a (diff) | |
parent | d9e2d4de48fb8bdbf5b6bb40aa6302e5bfccbe25 (diff) |
Pull from viewer-beta
Diffstat (limited to 'indra/newview/skins')
-rw-r--r-- | indra/newview/skins/default/colors.xml | 2 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_preferences.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index aeea2306f7..be94b40065 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -140,7 +140,7 @@ reference="AvatarListItemIconOfflineColor" /> <color name="BackgroundChatColor" - reference="DkGray_66" /> + reference="White" /> <color name="ButtonBorderColor" reference="Unused?" /> diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml index 36108442f3..8eee8f44b5 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences.xml @@ -83,7 +83,7 @@ label="Move & View" layout="topleft" help_topic="preferences_move_tab" - name="audio" /> + name="move" /> <panel class="panel_preference" filename="panel_preferences_alerts.xml" |