Skip to content

Commit 8b77f76

Browse files
committed
#3267 Fix parts of avatar's texture floater not being clickable
scroll_content_panel was too small and did not cover some of the pickers Panel's name wasn't unique, renamed to avoid confusion
1 parent 94f6265 commit 8b77f76

12 files changed

+15
-15
lines changed

indra/newview/skins/default/xui/da/floater_avatar_textures.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ teksturer
1414
teksturer
1515
</text>
1616
<button label="Vis IDs på skærm" label_selected="Dump" name="Dump"/>
17-
<panel name="scroll_content_panel">
17+
<panel name="scroll_content_panel2">
1818
<texture_picker label="Hår" name="hair-baked"/>
1919
<texture_picker label="Hår" name="hair_grain"/>
2020
<texture_picker label="Alpha - hår" name="hair_alpha"/>

indra/newview/skins/default/xui/de/floater_avatar_textures.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Texturen</text>
88
<text name="composite_label">Zusammengesetzte
99
Texturen</text>
1010
<button label="IDs an Konsole ausgeben" label_selected="Abladen" name="Dump"/>
11-
<panel name="scroll_content_panel">
11+
<panel name="scroll_content_panel2">
1212
<texture_picker label="Haare" name="hair-baked"/>
1313
<texture_picker label="Haare" name="hair_grain"/>
1414
<texture_picker label="Alpha: Haare" name="hair_alpha"/>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@ Textures
7070
width="150" />
7171

7272
<panel
73-
name="scroll_content_panel"
73+
name="scroll_content_panel2"
7474
follows="left|top"
7575
min_height="300"
7676
layout="topleft"
77-
top="43"
77+
top="60"
7878
background_visible="false"
79-
height="930"
79+
height="1113"
8080
left="0"
8181
width="1230">
8282

@@ -86,7 +86,7 @@ Textures
8686
layout="topleft"
8787
left="10"
8888
name="hair-baked"
89-
top="17"
89+
top="3"
9090
width="92" />
9191
<texture_picker
9292
height="103"

indra/newview/skins/default/xui/es/floater_avatar_textures.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<text name="label">Texturas obtenidas mediante bake</text>
77
<text name="composite_label">Texturas compuestas</text>
88
<button label="Volcar IDs a la consola" label_selected="Volcado" name="Dump"/>
9-
<panel name="scroll_content_panel">
9+
<panel name="scroll_content_panel2">
1010
<texture_picker label="Pelo" name="hair-baked"/>
1111
<texture_picker label="Pelo" name="hair_grain"/>
1212
<texture_picker label="Alfa del pelo" name="hair_alpha"/>

indra/newview/skins/default/xui/fr/floater_avatar_textures.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<text name="label">Textures figées</text>
77
<text name="composite_label">Textures composites</text>
88
<button label="Vider les ID dans la console" label_selected="Vider" name="Dump"/>
9-
<panel name="scroll_content_panel">
9+
<panel name="scroll_content_panel2">
1010
<texture_picker label="Cheveux" name="hair-baked"/>
1111
<texture_picker label="Cheveux" name="hair_grain"/>
1212
<texture_picker label="Alpha cheveux" name="hair_alpha"/>

indra/newview/skins/default/xui/it/floater_avatar_textures.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ texture</text>
88
<text name="composite_label">Composito
99
Texture</text>
1010
<button label="Memorizza gli ID sulla console" label_selected="Dump" name="Dump"/>
11-
<panel name="scroll_content_panel">
11+
<panel name="scroll_content_panel2">
1212
<texture_picker label="Capigliature" name="hair-baked"/>
1313
<texture_picker label="Capigliature" name="hair_grain"/>
1414
<texture_picker label="Alpha dei capelli" name="hair_alpha"/>

indra/newview/skins/default/xui/ja/floater_avatar_textures.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
合成テクスチャ
1414
</text>
1515
<button label="IDをコンソールにダンプ" label_selected="ダンプ" name="Dump"/>
16-
<panel name="scroll_content_panel">
16+
<panel name="scroll_content_panel2">
1717
<texture_picker label="" name="hair-baked"/>
1818
<texture_picker label="" name="hair_grain"/>
1919
<texture_picker label="髪のアルファ" name="hair_alpha"/>

indra/newview/skins/default/xui/pl/floater_avatar_textures.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ prerenderowane
1414
kompozytowe
1515
</text>
1616
<button label="Zrzuć ID do Konsoli" label_selected="Zrzuć" name="Dump" />
17-
<panel name="scroll_content_panel">
17+
<panel name="scroll_content_panel2">
1818
<texture_picker label="Włosy" name="hair-baked" />
1919
<texture_picker label="Włosy" name="hair_grain" />
2020
<texture_picker label="Alpha włosów" name="hair_alpha" />

indra/newview/skins/default/xui/pt/floater_avatar_textures.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Texturas</text>
88
<text name="composite_label">Compósito:
99
Texturas</text>
1010
<button label="Enviar IDs para painel" label_selected="Dump" name="Dump"/>
11-
<panel name="scroll_content_panel">
11+
<panel name="scroll_content_panel2">
1212
<texture_picker label="Cabelo" name="hair-baked"/>
1313
<texture_picker label="Cabelo" name="hair_grain"/>
1414
<texture_picker label="Cabelo alpha" name="hair_alpha"/>

indra/newview/skins/default/xui/ru/floater_avatar_textures.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
Текстуры
1515
</text>
1616
<button label="Вывод ID на консоль" label_selected="Вывод" name="Dump"/>
17-
<panel name="scroll_content_panel">
17+
<panel name="scroll_content_panel2">
1818
<texture_picker label="Волосы" name="hair-baked"/>
1919
<texture_picker label="Волосы" name="hair_grain"/>
2020
<texture_picker label="Альфа волос" name="hair_alpha"/>

0 commit comments

Comments
 (0)