diff options
| author | Jacek Antonelli | 2011-06-14 22:24:53 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2011-06-14 22:24:53 -0500 |
| commit | 87219855c664447a39dd7c2d8866f0a630d1c843 (patch) | |
| tree | 4bc6f3f750805a31b8879f5673fae41dd7983159 /linden/indra/newview/skins/default | |
| parent | Merge remote-tracking branch 'thickbrick/misc' into next (diff) | |
| download | meta-impy-87219855c664447a39dd7c2d8866f0a630d1c843.zip meta-impy-87219855c664447a39dd7c2d8866f0a630d1c843.tar.gz meta-impy-87219855c664447a39dd7c2d8866f0a630d1c843.tar.bz2 meta-impy-87219855c664447a39dd7c2d8866f0a630d1c843.tar.xz | |
Reverted ability to customize the Imprudence client tag color.
The Imprudence tag color is part of our official branding. Users can
turn it off, but the color itself is not a matter of user preference.
This reverts commits e7ab172b762bbbb87ca78889fdaecfda39a71233
and c903ce543fecedd53d07f2d0fa7f6b149b2b8a1, and removes two
widgets from Preferences > Colors.
Diffstat (limited to 'linden/indra/newview/skins/default')
| -rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml index 9b55822..04e71d4 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_colors.xml | |||
| @@ -33,24 +33,7 @@ USE left="270" FOR TABBING OPTIONS | |||
| 33 | tool_tip="Click to open Color Picker" width="65" /> | 33 | tool_tip="Click to open Color Picker" width="65" /> |
| 34 | 34 | ||
| 35 | 35 | ||
| 36 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 36 | <view_border bevel_style="none" border_thickness="1" bottom_delta="0" follows="left|top" |
| 37 | bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font-style="BOLD|SHADOW" | ||
| 38 | font="SansSerifSmall" h_pad="0" halign="left" height="10" left="270" | ||
| 39 | mouse_opaque="true" name="client_tag_color_textbox" v_pad="0" width="394"> | ||
| 40 | Client Tag Color: | ||
| 41 | </text> | ||
| 42 | <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-80" | ||
| 43 | can_apply_immediately="true" color="0.79 0.44 0.88 1" | ||
| 44 | enabled="true" follows="left|top" | ||
| 45 | height="65" label="Imprudence" left_delta="30" mouse_opaque="true" | ||
| 46 | name="client_tag_color" width="65" /> | ||
| 47 | <check_box bottom_delta="45" enabled="true" follows="left|top" | ||
| 48 | font="SansSerifSmall" height="16" initial_value="false" | ||
| 49 | label="Color client tags" left_delta="76" mouse_opaque="true" | ||
| 50 | name="client_name_color_check" radio_style="false" width="160" /> | ||
| 51 | |||
| 52 | |||
| 53 | <view_border bevel_style="none" border_thickness="1" bottom_delta="-60" follows="left|top" | ||
| 54 | height="1" left="55" name="border" width="380" /> | 37 | height="1" left="55" name="border" width="380" /> |
| 55 | 38 | ||
| 56 | 39 | ||