diff options
author | elektrahesse | 2010-10-08 14:14:27 +0200 |
---|---|---|
committer | elektrahesse | 2010-10-08 14:14:27 +0200 |
commit | f944d8f9d855e0c5f3f04840060cd1e4c4b3cf69 (patch) | |
tree | 08033d5460509818c9e100ca7126865f8b9e0327 /linden/indra/newview/skins/default/xui/en-us | |
parent | Fixed TOS loading and renamed corretly LLIamHere classes in TOS and Voice TOS... (diff) | |
download | meta-impy-f944d8f9d855e0c5f3f04840060cd1e4c4b3cf69.zip meta-impy-f944d8f9d855e0c5f3f04840060cd1e4c4b3cf69.tar.gz meta-impy-f944d8f9d855e0c5f3f04840060cd1e4c4b3cf69.tar.bz2 meta-impy-f944d8f9d855e0c5f3f04840060cd1e4c4b3cf69.tar.xz |
Implemented friends tags highlighting, including preferences->general checkbox to enable/disable the feature. The font on the tags is rendered in bold when the option is active.
Diffstat (limited to 'linden/indra/newview/skins/default/xui/en-us')
-rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml index 7b4b809..badd2b4 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml | |||
@@ -44,6 +44,10 @@ | |||
44 | font="SansSerifSmall" height="16" initial_value="false" | 44 | font="SansSerifSmall" height="16" initial_value="false" |
45 | label="Hide my name on my screen" left="151" name="show_my_name_checkbox" | 45 | label="Hide my name on my screen" left="151" name="show_my_name_checkbox" |
46 | width="200" /> | 46 | width="200" /> |
47 | <check_box bottom_delta="-20" follows="left|top" | ||
48 | font="SansSerifSmall" height="16" initial_value="false" | ||
49 | label="Highlight friends tags" left="151" name="highlight_friends_checkbox" | ||
50 | width="200" /> | ||
47 | <text type="string" length="1" bottom_delta="-24" follows="left|top" font="SansSerifSmall" h_pad="0" | 51 | <text type="string" length="1" bottom_delta="-24" follows="left|top" font="SansSerifSmall" h_pad="0" |
48 | halign="left" height="16" left="10" name="group_titles_textbox" v_pad="0" | 52 | halign="left" height="16" left="10" name="group_titles_textbox" v_pad="0" |
49 | width="394"> | 53 | width="394"> |
@@ -57,34 +61,34 @@ | |||
57 | font="SansSerifSmall" height="16" initial_value="false" | 61 | font="SansSerifSmall" height="16" initial_value="false" |
58 | label="Hide my group title" left="151" name="show_my_title_checkbox" | 62 | label="Hide my group title" left="151" name="show_my_title_checkbox" |
59 | radio_style="false" width="256" /> | 63 | radio_style="false" width="256" /> |
60 | <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-210" | 64 | <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-230" |
61 | can_apply_immediately="false" color="1 1 1 1" | 65 | can_apply_immediately="false" color="1 1 1 1" |
62 | enabled="true" follows="left|top" height="65" label="" left="153" | 66 | enabled="true" follows="left|top" height="65" label="" left="153" |
63 | mouse_opaque="true" name="effect_color_swatch" | 67 | mouse_opaque="true" name="effect_color_swatch" |
64 | tool_tip="Click to open Color Picker" width="55" /> | 68 | tool_tip="Click to open Color Picker" width="55" /> |
65 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 69 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
66 | bottom="-215" drop_shadow_visible="true" enabled="true" follows="left|top" | 70 | bottom="-235" drop_shadow_visible="true" enabled="true" follows="left|top" |
67 | font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10" | 71 | font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10" |
68 | mouse_opaque="true" name="UI Size:" v_pad="0" width="128"> | 72 | mouse_opaque="true" name="UI Size:" v_pad="0" width="128"> |
69 | UI Size: | 73 | UI Size: |
70 | </text> | 74 | </text> |
71 | <slider bottom="-217" can_edit_text="true" | 75 | <slider bottom="-237" can_edit_text="true" |
72 | decimal_digits="3" enabled="true" height="16" increment="0.001" | 76 | decimal_digits="3" enabled="true" height="16" increment="0.001" |
73 | initial_val="1" left="148" max_val="1.4" min_val="0.75" mouse_opaque="true" | 77 | initial_val="1" left="148" max_val="1.4" min_val="0.75" mouse_opaque="true" |
74 | name="ui_scale_slider" show_text="true" value="1" width="220" /> | 78 | name="ui_scale_slider" show_text="true" value="1" width="220" /> |
75 | <button bottom="-221" enabled="true" follows="left|top" | 79 | <button bottom="-241" enabled="true" follows="left|top" |
76 | font="SansSerif" halign="center" height="22" label="Reset" | 80 | font="SansSerif" halign="center" height="22" label="Reset" |
77 | label_selected="Reset" left_delta="226" mouse_opaque="true" | 81 | label_selected="Reset" left_delta="226" mouse_opaque="true" |
78 | name="reset_ui_size" scale_image="true" width="80" /> | 82 | name="reset_ui_size" scale_image="true" width="80" /> |
79 | <check_box bottom="-236" enabled="true" follows="left|top" | 83 | <check_box bottom="-256" enabled="true" follows="left|top" |
80 | font="SansSerifSmall" height="16" initial_value="false" | 84 | font="SansSerifSmall" height="16" initial_value="false" |
81 | label="Use resolution independent scale" left="151" mouse_opaque="true" | 85 | label="Use resolution independent scale" left="151" mouse_opaque="true" |
82 | name="ui_auto_scale" radio_style="false" width="256" /> | 86 | name="ui_auto_scale" radio_style="false" width="256" /> |
83 | <check_box bottom="-260" enabled="true" follows="left|top" | 87 | <check_box bottom="-280" enabled="true" follows="left|top" |
84 | font="SansSerifSmall" height="16" initial_value="false" | 88 | font="SansSerifSmall" height="16" initial_value="false" |
85 | label="Go Away/AFK when idle" left="330" mouse_opaque="true" | 89 | label="Go Away/AFK when idle" left="330" mouse_opaque="true" |
86 | name="afk_timeout_checkbox" radio_style="false" width="256" /> | 90 | name="afk_timeout_checkbox" radio_style="false" width="256" /> |
87 | <spinner bottom="-260" decimal_digits="0" enabled="true" | 91 | <spinner bottom="-280" decimal_digits="0" enabled="true" |
88 | follows="left|top" height="16" increment="1" initial_val="300" | 92 | follows="left|top" height="16" increment="1" initial_val="300" |
89 | label="Away Timeout:" label_width="141" left="10" max_val="600" | 93 | label="Away Timeout:" label_width="141" left="10" max_val="600" |
90 | min_val="30" mouse_opaque="true" name="afk_timeout_spinner" width="202" /> | 94 | min_val="30" mouse_opaque="true" name="afk_timeout_spinner" width="202" /> |
@@ -105,18 +109,18 @@ | |||
105 | mouse_opaque="true" name="mini_map_notify_sim" radio_style="false" | 109 | mouse_opaque="true" name="mini_map_notify_sim" radio_style="false" |
106 | width="256" /> | 110 | width="256" /> |
107 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 111 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
108 | bottom="-312" drop_shadow_visible="true" enabled="true" follows="left|top" | 112 | bottom="-332" drop_shadow_visible="true" enabled="true" follows="left|top" |
109 | font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10" | 113 | font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10" |
110 | mouse_opaque="true" name="maturity_desired_label" v_pad="0" width="394"> | 114 | mouse_opaque="true" name="maturity_desired_label" v_pad="0" width="394"> |
111 | Rating: | 115 | Rating: |
112 | </text> | 116 | </text> |
113 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 117 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
114 | bottom="-312" drop_shadow_visible="true" enabled="true" follows="left|top" | 118 | bottom="-332" drop_shadow_visible="true" enabled="true" follows="left|top" |
115 | font="SansSerifSmall" h_pad="0" halign="left" height="10" left="151" | 119 | font="SansSerifSmall" h_pad="0" halign="left" height="10" left="151" |
116 | mouse_opaque="true" name="maturity_desired_prompt" v_pad="0" width="394"> | 120 | mouse_opaque="true" name="maturity_desired_prompt" v_pad="0" width="394"> |
117 | I want to access content rated: | 121 | I want to access content rated: |
118 | </text> | 122 | </text> |
119 | <combo_box bottom="-318" follows="left|top" height="18" left="315" | 123 | <combo_box bottom="-338" follows="left|top" height="18" left="315" |
120 | mouse_opaque="true" name="maturity_desired_combobox" width="150"> | 124 | mouse_opaque="true" name="maturity_desired_combobox" width="150"> |
121 | <combo_item name="Desired_Adult" value="42"> | 125 | <combo_item name="Desired_Adult" value="42"> |
122 | PG, Mature and Adult | 126 | PG, Mature and Adult |
@@ -129,7 +133,7 @@ | |||
129 | </combo_item> | 133 | </combo_item> |
130 | </combo_box> | 134 | </combo_box> |
131 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 135 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
132 | bottom="-312" drop_shadow_visible="true" enabled="true" follows="left|top" | 136 | bottom="-332" drop_shadow_visible="true" enabled="true" follows="left|top" |
133 | font="SansSerifSmall" h_pad="0" halign="left" height="10" left="315" | 137 | font="SansSerifSmall" h_pad="0" halign="left" height="10" left="315" |
134 | mouse_opaque="true" name="maturity_desired_textbox" v_pad="0" width="150"> | 138 | mouse_opaque="true" name="maturity_desired_textbox" v_pad="0" width="150"> |
135 | PG only | 139 | PG only |
@@ -147,25 +151,25 @@ | |||
147 | Nametags: | 151 | Nametags: |
148 | </text> | 152 | </text> |
149 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 153 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
150 | bottom="-155" drop_shadow_visible="true" enabled="true" follows="left|top" | 154 | bottom="-175" drop_shadow_visible="true" enabled="true" follows="left|top" |
151 | font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10" | 155 | font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10" |
152 | mouse_opaque="true" name="effects_color_textbox" v_pad="0" width="394"> | 156 | mouse_opaque="true" name="effects_color_textbox" v_pad="0" width="394"> |
153 | Selection Beam Color: | 157 | Selection Beam Color: |
154 | </text> | 158 | </text> |
155 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 159 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
156 | bottom="-254" drop_shadow_visible="true" enabled="true" follows="left|top" | 160 | bottom="-274" drop_shadow_visible="true" enabled="true" follows="left|top" |
157 | font="SansSerifSmall" h_pad="0" halign="left" height="10" left="220" | 161 | font="SansSerifSmall" h_pad="0" halign="left" height="10" left="220" |
158 | mouse_opaque="true" name="seconds_textbox" v_pad="0" width="128"> | 162 | mouse_opaque="true" name="seconds_textbox" v_pad="0" width="128"> |
159 | seconds | 163 | seconds |
160 | </text> | 164 | </text> |
161 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 165 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
162 | bottom="-352" drop_shadow_visible="true" enabled="true" follows="left|top" | 166 | bottom="-372" drop_shadow_visible="true" enabled="true" follows="left|top" |
163 | font="SansSerifSmall" h_pad="0" halign="left" height="18" left="10" | 167 | font="SansSerifSmall" h_pad="0" halign="left" height="18" left="10" |
164 | mouse_opaque="true" name="time_textbox" v_pad="0" width="394"> | 168 | mouse_opaque="true" name="time_textbox" v_pad="0" width="394"> |
165 | Clock: | 169 | Clock: |
166 | </text> | 170 | </text> |
167 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 171 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
168 | bottom="-384" drop_shadow_visible="true" enabled="true" follows="left|top" | 172 | bottom="-404" drop_shadow_visible="true" enabled="true" follows="left|top" |
169 | font="SansSerifSmall" h_pad="0" halign="left" height="18" left="10" | 173 | font="SansSerifSmall" h_pad="0" halign="left" height="18" left="10" |
170 | mouse_opaque="true" name="language_textbox" v_pad="0" width="394"> | 174 | mouse_opaque="true" name="language_textbox" v_pad="0" width="394"> |
171 | Language: | 175 | Language: |
@@ -180,7 +184,7 @@ | |||
180 | <string name="region_name_prompt"> | 184 | <string name="region_name_prompt"> |
181 | <Type region name> | 185 | <Type region name> |
182 | </string> | 186 | </string> |
183 | <combo_box allow_text_entry="false" bottom="-352" enabled="true" follows="left|top" | 187 | <combo_box allow_text_entry="false" bottom="-372" enabled="true" follows="left|top" |
184 | height="18" left="153" max_chars="20" mouse_opaque="true" | 188 | height="18" left="153" max_chars="20" mouse_opaque="true" |
185 | name="time_combobox" width="146"> | 189 | name="time_combobox" width="146"> |
186 | <combo_item type="string" name="12HourTime" value="PST 12"> | 190 | <combo_item type="string" name="12HourTime" value="PST 12"> |
@@ -193,7 +197,7 @@ | |||
193 | UTC | 197 | UTC |
194 | </combo_item> | 198 | </combo_item> |
195 | </combo_box> | 199 | </combo_box> |
196 | <combo_box allow_text_entry="true" bottom="-382" enabled="true" | 200 | <combo_box allow_text_entry="true" bottom="-402" enabled="true" |
197 | follows="left|top" height="16" left="153" max_chars="135" | 201 | follows="left|top" height="16" left="153" max_chars="135" |
198 | mouse_opaque="true" name="language_combobox" width="146"> | 202 | mouse_opaque="true" name="language_combobox" width="146"> |
199 | <combo_item type="string" length="1" enabled="true" name="System Default Language" value="default"> | 203 | <combo_item type="string" length="1" enabled="true" name="System Default Language" value="default"> |