Skip to content

Commit dd09848

Browse files
committed
Fix profile's pick hiding wrong panel
And cleanup after a contribution
1 parent da48bd9 commit dd09848

13 files changed

+27
-35
lines changed

indra/newview/skins/default/xui/en/floater_about_land.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@
290290
image_pressed="Info_Press"
291291
image_unselected="Info_Over"
292292
left_pad="3"
293-
name="info_btn1"
293+
name="info_btn"
294294
top_delta="-2"
295295
width="16" />
296296
<button

indra/newview/skins/default/xui/en/floater_beacons.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@
157157
font="SansSerif"
158158
left="0"
159159
top_pad="7"
160-
name="label_objects1"
160+
name="label_direction"
161161
text_color="White"
162162
type="string">
163163
Show direction to:

indra/newview/skins/default/xui/en/floater_scene_load_stats.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
tick_spacing="100"
120120
show_history="true"
121121
show_bar="false"/>
122-
<stat_bar name="texture_decode_latency1"
122+
<stat_bar name="texture_write_latency"
123123
label="Cache Write Latency"
124124
orientation="horizontal"
125125
unit_label="sec"

indra/newview/skins/default/xui/en/floater_translation_settings.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@
161161
layout="topleft"
162162
left="185"
163163
length="1"
164-
name="google_links_text"
164+
name="azure_links_text"
165165
top_pad="-262"
166166
type="string"
167167
width="100">
@@ -302,7 +302,7 @@
302302
layout="topleft"
303303
left="185"
304304
length="1"
305-
name="google_links_text1"
305+
name="google_links_text"
306306
top_delta="-23"
307307
type="string"
308308
width="100">

indra/newview/skins/default/xui/en/floater_world_map.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@
241241
image_name="legend.tga"
242242
layout="topleft"
243243
mouse_opaque="true"
244-
name="square2"
244+
name="square2_auction"
245245
left="20"
246246
top_pad="2"
247247
width="16" />
@@ -264,7 +264,7 @@
264264
image_name="legend.tga"
265265
layout="topleft"
266266
mouse_opaque="true"
267-
name="square21"
267+
name="square2_owner"
268268
left="20"
269269
top_pad="-5"
270270
width="16" />

indra/newview/skins/default/xui/en/mime_types.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@
496496
media_plugin_libvlc
497497
</impl>
498498
</mimetype>
499-
<mimetype name="application/octet-stream1">
499+
<mimetype name="application/octet-stream">
500500
<label name="video/octet-stream">
501501
Movie
502502
</label>

indra/newview/skins/default/xui/en/notifications.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6473,14 +6473,6 @@ Your inventory is experiencing issues. Please, contact support.
64736473
<tag>fail</tag>
64746474
</notification>
64756475

6476-
<notification
6477-
icon="notifytip.tga"
6478-
name="InventoryLimitReachedAIS1"
6479-
type="notifytip">
6480-
Your inventory is experiencing issues. Please, contact support.
6481-
<tag>fail</tag>
6482-
</notification>
6483-
64846476
<notification
64856477
icon="alertmodal.tga"
64866478
name="ConfirmClearBrowserCache"

indra/newview/skins/default/xui/en/panel_performance_preferences.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
layout="topleft"
157157
left_pad="10"
158158
top_delta="1"
159-
name="quality_lbl1"
159+
name="best_quality_lbl"
160160
width="70">
161161
Best quality
162162
</text>
@@ -416,7 +416,7 @@
416416
layout="topleft"
417417
top_delta="3"
418418
left_pad="10"
419-
name="photo_desc1"
419+
name="photo_dist_det_desc"
420420
width="180">
421421
(Enter value between 0.0 and 4.0)
422422
</text>

indra/newview/skins/default/xui/en/panel_preferences_advanced.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
left_pad="0"
167167
max_val="2.0"
168168
min_val="1.0"
169-
name="ui_scale_slider1"
169+
name="hud_scale_slider"
170170
top_pad="-14"
171171
width="250" />
172172
<check_box

indra/newview/skins/default/xui/en/panel_preferences_sound.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
is_toggle="true"
108108
layout="topleft"
109109
left_pad="5"
110-
name="mute_audio1"
110+
name="mute_audio_ui"
111111
tab_stop="false"
112112
width="16" />
113113
<slider
@@ -141,7 +141,7 @@
141141
is_toggle="true"
142142
layout="topleft"
143143
left_pad="5"
144-
name="mute_audio2"
144+
name="mute_audio_ambient"
145145
tab_stop="false"
146146
width="16" />
147147
<slider
@@ -175,7 +175,7 @@
175175
is_toggle="true"
176176
layout="topleft"
177177
left_pad="5"
178-
name="mute_audio3"
178+
name="mute_audio_sounds"
179179
tab_stop="false"
180180
width="16">
181181
<button.commit_callback
@@ -212,7 +212,7 @@
212212
is_toggle="true"
213213
layout="topleft"
214214
left_pad="5"
215-
name="mute_audio4"
215+
name="mute_audio_music"
216216
tab_stop="false"
217217
width="16" />
218218
<check_box
@@ -258,7 +258,7 @@
258258
is_toggle="true"
259259
layout="topleft"
260260
left_pad="5"
261-
name="mute_audio5"
261+
name="mute_audio_media"
262262
tab_stop="false"
263263
width="16" />
264264
<check_box
@@ -306,7 +306,7 @@
306306
is_toggle="true"
307307
layout="topleft"
308308
left_pad="5"
309-
name="mute_audio6"
309+
name="mute_audio_voice"
310310
tab_stop="false"
311311
width="16" />
312312
<check_box

0 commit comments

Comments
 (0)