summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/da/floater_tools.xml5
-rw-r--r--indra/newview/skins/default/xui/de/floater_tools.xml5
-rw-r--r--indra/newview/skins/default/xui/en/floater_region_info.xml2
-rw-r--r--indra/newview/skins/default/xui/en/floater_tools.xml29
-rw-r--r--indra/newview/skins/default/xui/en/panel_edit_wearable.xml99
-rw-r--r--indra/newview/skins/default/xui/en/panel_outfit_edit.xml21
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_advanced.xml17
-rw-r--r--indra/newview/skins/default/xui/es/floater_tools.xml5
-rw-r--r--indra/newview/skins/default/xui/fr/floater_tools.xml5
-rw-r--r--indra/newview/skins/default/xui/it/floater_tools.xml5
-rw-r--r--indra/newview/skins/default/xui/ja/floater_tools.xml5
-rw-r--r--indra/newview/skins/default/xui/nl/floater_tools.xml5
-rw-r--r--indra/newview/skins/default/xui/pl/floater_tools.xml5
-rw-r--r--indra/newview/skins/default/xui/pt/floater_tools.xml5
14 files changed, 138 insertions, 75 deletions
diff --git a/indra/newview/skins/default/xui/da/floater_tools.xml b/indra/newview/skins/default/xui/da/floater_tools.xml
index a39a7e8698..b501722e92 100644
--- a/indra/newview/skins/default/xui/da/floater_tools.xml
+++ b/indra/newview/skins/default/xui/da/floater_tools.xml
@@ -67,7 +67,10 @@
<text name="RenderingCost" tool_tip="Hvis beregnede rendering omkostninger for dette objekt">
þ: [COUNT]
</text>
- <check_box label="Stræk begge sider" name="checkbox uniform"/>
+ <check_box name="checkbox uniform"/>
+ <text name="checkbox uniform label">
+ Stræk begge sider
+ </text>
<check_box initial_value="true" label="Stræk teksturer" name="checkbox stretch textures"/>
<check_box initial_value="true" label="Benyt gitter" name="checkbox snap to grid"/>
<combo_box name="combobox grid mode" tool_tip="Vælg hvilken type lineal der skal bruges til positionering af objekt">
diff --git a/indra/newview/skins/default/xui/de/floater_tools.xml b/indra/newview/skins/default/xui/de/floater_tools.xml
index bb28f1b33f..c5c11faf93 100644
--- a/indra/newview/skins/default/xui/de/floater_tools.xml
+++ b/indra/newview/skins/default/xui/de/floater_tools.xml
@@ -67,7 +67,10 @@
<text name="RenderingCost" tool_tip="Zeigt die errechneten Wiedergabekosten für dieses Objekt">
þ: [COUNT]
</text>
- <check_box label="Beide Seiten dehnen" name="checkbox uniform"/>
+ <check_box name="checkbox uniform"/>
+ <text name="checkbox uniform label">
+ Beide Seiten dehnen
+ </text>
<check_box initial_value="true" label="Texturen dehnen" name="checkbox stretch textures"/>
<check_box initial_value="true" label="An Raster ausrichten" name="checkbox snap to grid" top_pad="10"/>
<combo_box name="combobox grid mode" tool_tip="Wählen Sie ein Rasterlineal zum Positionieren des Objekts aus.">
diff --git a/indra/newview/skins/default/xui/en/floater_region_info.xml b/indra/newview/skins/default/xui/en/floater_region_info.xml
index 262bcd07a0..32fb6f97e7 100644
--- a/indra/newview/skins/default/xui/en/floater_region_info.xml
+++ b/indra/newview/skins/default/xui/en/floater_region_info.xml
@@ -7,7 +7,7 @@
name="regioninfo"
save_rect="true"
title="REGION/ESTATE"
- width="480">
+ width="530">
<tab_container
bottom="555"
follows="left|right|top|bottom"
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index c3c63cec37..efc1a66d95 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -220,8 +220,8 @@
</radio_group>
<radio_group
follows="left|top"
- left="10"
- top="54"
+ left="5"
+ top="59"
height="70"
layout="topleft"
name="edit_radio_group">
@@ -254,7 +254,8 @@
control_name="EditLinkedParts"
label="Edit linked"
layout="topleft"
- name="checkbox edit linked parts" >
+ name="checkbox edit linked parts"
+ top_pad="0">
<check_box.commit_callback
function="BuildTool.selectComponent"/>
</check_box>
@@ -274,20 +275,31 @@
<check_box
control_name="ScaleUniform"
height="19"
- label="Stretch Both Sides"
+ label=""
layout="topleft"
left="143"
name="checkbox uniform"
top="50"
- width="134" />
+ width="20" />
+ <text
+ height="19"
+ label="Stretch Both Sides"
+ left="163"
+ name="checkbox uniform label"
+ top="55"
+ width="120"
+ wrap="true">
+ Stretch Both Sides
+ </text>
<check_box
control_name="ScaleStretchTextures"
height="19"
initial_value="true"
label="Stretch Textures"
layout="topleft"
+ left="143"
name="checkbox stretch textures"
- top_pad="0"
+ top_pad="7"
width="134" />
<check_box
control_name="SnapEnabled"
@@ -295,7 +307,7 @@
initial_value="true"
label="Snap to grid"
layout="topleft"
- top_pad="7"
+ top_pad="0"
name="checkbox snap to grid"
width="134" />
<combo_box
@@ -304,6 +316,7 @@
follows="left|top"
name="combobox grid mode"
tool_tip="Choose the type of grid ruler for positioning the object"
+ top_pad="0"
width="108">
<combo_box.item
label="World grid"
@@ -2330,7 +2343,7 @@ even though the user gets a free copy.
height="19"
label="Full Bright"
layout="topleft"
- left_delta="0"
+ left_delta="-5"
name="checkbox fullbright"
top_pad="4"
width="81" />
diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
index 40fcc1d76c..71f740590b 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
@@ -233,7 +233,7 @@ left="0"
</panel>
<panel
follows="all"
- height="400"
+ height="408"
layout="topleft"
left="0"
name="edit_subpanel_container"
@@ -244,7 +244,7 @@ left="0"
<panel
filename="panel_edit_shape.xml"
follows="all"
- height="400"
+ height="408"
layout="topleft"
left="0"
name="edit_shape_panel"
@@ -254,7 +254,7 @@ left="0"
<panel
filename="panel_edit_skin.xml"
follows="all"
- height="392"
+ height="400"
layout="topleft"
left="0"
name="edit_skin_panel"
@@ -264,7 +264,7 @@ left="0"
<panel
filename="panel_edit_hair.xml"
follows="all"
- height="392"
+ height="400"
layout="topleft"
left="0"
name="edit_hair_panel"
@@ -274,7 +274,7 @@ left="0"
<panel
filename="panel_edit_eyes.xml"
follows="all"
- height="392"
+ height="400"
layout="topleft"
left="0"
name="edit_eyes_panel"
@@ -284,7 +284,7 @@ left="0"
<panel
filename="panel_edit_shirt.xml"
follows="all"
- height="392"
+ height="400"
layout="topleft"
left="0"
name="edit_shirt_panel"
@@ -294,7 +294,7 @@ left="0"
<panel
filename="panel_edit_pants.xml"
follows="all"
- height="392"
+ height="400"
layout="topleft"
left="0"
name="edit_pants_panel"
@@ -304,7 +304,7 @@ left="0"
<panel
filename="panel_edit_shoes.xml"
follows="all"
- height="392"
+ height="400"
layout="topleft"
left="0"
name="edit_shoes_panel"
@@ -314,7 +314,7 @@ left="0"
<panel
filename="panel_edit_socks.xml"
follows="all"
- height="392"
+ height="400"
layout="topleft"
left="0"
name="edit_socks_panel"
@@ -324,7 +324,7 @@ left="0"
<panel
filename="panel_edit_jacket.xml"
follows="all"
- height="392"
+ height="400"
layout="topleft"
left="0"
name="edit_jacket_panel"
@@ -334,7 +334,7 @@ left="0"
<panel
filename="panel_edit_skirt.xml"
follows="all"
- height="392"
+ height="400"
layout="topleft"
left="0"
name="edit_skirt_panel"
@@ -344,7 +344,7 @@ left="0"
<panel
filename="panel_edit_gloves.xml"
follows="all"
- height="392"
+ height="400"
layout="topleft"
left="0"
name="edit_gloves_panel"
@@ -354,7 +354,7 @@ left="0"
<panel
filename="panel_edit_undershirt.xml"
follows="all"
- height="392"
+ height="400"
layout="topleft"
left="0"
name="edit_undershirt_panel"
@@ -364,7 +364,7 @@ left="0"
<panel
filename="panel_edit_underpants.xml"
follows="all"
- height="392"
+ height="400"
layout="topleft"
left="0"
name="edit_underpants_panel"
@@ -374,7 +374,7 @@ left="0"
<panel
filename="panel_edit_alpha.xml"
follows="all"
- height="392"
+ height="400"
layout="topleft"
left="0"
name="edit_alpha_panel"
@@ -384,7 +384,7 @@ left="0"
<panel
filename="panel_edit_tattoo.xml"
follows="all"
- height="392"
+ height="400"
layout="topleft"
left="0"
name="edit_tattoo_panel"
@@ -393,58 +393,71 @@ left="0"
width="333" />
</panel>
<panel
- follows="left|right|bottom"
- height="38"
+ follows="bottom|left|right"
+ height="25"
label="gear_buttom_panel"
- layout="bottom|left|right"
+ layout="topleft"
left="0"
- bottom="25"
name="gear_buttom_panel"
+ top_pad="0"
width="333">
<button
follows="bottom|left"
tool_tip="Options"
- height="18"
+ height="25"
+ image_hover_unselected="Toolbar_Left_Over"
image_disabled="OptionsMenu_Disabled"
- image_selected="OptionsMenu_Press"
- image_unselected="OptionsMenu_Off"
+ image_overlay="OptionsMenu_Off"
+ image_selected="Toolbar_Left_Selected"
+ image_unselected="Toolbar_Left_Off"
layout="topleft"
left="10"
name="friends_viewsort_btn"
- top="10"
- width="18" />
+ top="0"
+ width="31" />
<button
follows="bottom|left"
- height="18"
- image_selected="AddItem_Press"
- image_unselected="AddItem_Off"
+ height="25"
+ image_hover_unselected="Toolbar_Middle_Over"
+ image_overlay="AddItem_Off"
+ image_selected="Toolbar_Middle_Selected"
+ image_unselected="Toolbar_Middle_Off"
image_disabled="AddItem_Disabled"
layout="topleft"
- left_pad="10"
+ left_pad="1"
name="add_btn"
tool_tip="TODO"
- width="18" />
+ width="31" />
+ <icon
+ follows="bottom|left|right"
+ height="25"
+ image_name="Toolbar_Middle_Off"
+ layout="topleft"
+ left_pad="1"
+ name="dummy_right_icon"
+ width="218" >
+ </icon>
<button
- follows="bottom|left"
- height="18"
- image_selected="TrashItem_Press"
- image_unselected="TrashItem_Off"
+ follows="bottom|right"
+ height="25"
+ image_hover_unselected="Toolbar_Right_Over"
+ image_overlay="TrashItem_Off"
+ image_selected="Toolbar_Right_Selected"
+ image_unselected="Toolbar_Right_Off"
image_disabled="TrashItem_Disabled"
layout="topleft"
- left_pad="10"
- right="-10"
+ left_pad="1"
name="del_btn"
tool_tip="TODO"
- top_delta="0"
- width="18" />
+ width="31" />
</panel>
<panel
follows="bottom|left|right"
- height="25"
- layout="bottom|left|right"
- left="0"
+ height="23"
+ layout="topleft"
+ left="2"
name="button_panel"
- bottom="5"
+ top_pad="6"
width="333" >
<button
follows="bottomleft"
@@ -462,6 +475,6 @@ left="0"
label="Revert"
left_pad="7"
name="revert_button"
- width="153" />
+ width="152" />
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index 454a808f02..b473a7a282 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -310,13 +310,13 @@
allow_multi_select="true"
border="false"
follows="left|top|right|bottom"
- height="130"
+ height="140"
layout="topleft"
left="0"
mouse_opaque="false"
name="inventory_items"
top_pad="5"
- width="311"
+ width="310"
visible="false"/>
<panel
name="filtered_wearables_panel"
@@ -325,7 +325,7 @@
layout="topleft"
follows="left|top|right|bottom"
border="false"
- height="130"
+ height="140"
left="0"
mouse_opaque="false"
width="311"
@@ -336,8 +336,8 @@
allow_select="true"
layout="topleft"
follows="all"
- width="311"
- height="130"
+ width="310"
+ height="140"
left="0"
top="0"/>
</panel>
@@ -354,7 +354,7 @@
left="0"
name="add_wearables_button_bar"
top_pad="0"
- width="300">
+ width="313">
<button
follows="bottom|left"
height="25"
@@ -406,6 +406,15 @@
name="add_to_outfit_btn"
top="1"
width="31" />
+ <icon
+ follows="bottom|left|right"
+ height="25"
+ image_name="Toolbar_Right_Off"
+ layout="topleft"
+ left_pad="1"
+ name="dummy_right_icon"
+ width="184" >
+ </icon>
</panel>
</layout_panel>
</layout_stack>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 0129d97616..40a644657a 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -174,9 +174,10 @@ Automatic position for:
label="Opacity"
layout="topleft"
left="80"
- label_width="60"
+ label_width="156"
name="bubble_chat_opacity"
- width="200" />
+ top_pad = "10"
+ width="347" />
<color_swatch
can_apply_immediately="true"
color="0 0 0 1"
@@ -184,7 +185,7 @@ Automatic position for:
follows="left|top"
height="50"
layout="topleft"
- left_pad="10"
+ left_pad="30"
top="190"
name="background"
tool_tip="Choose color for bubble chat"
@@ -202,10 +203,10 @@ Automatic position for:
follows="left|top"
height="12"
layout="topleft"
- left="30"
+ left="80"
name="UI Size:"
- top_pad="5"
- width="300">
+ top_pad="25"
+ width="160">
UI size
</text>
<slider
@@ -216,7 +217,7 @@ Automatic position for:
increment="0.025"
initial_value="1"
layout="topleft"
- left_delta="52"
+ left_pad="0"
max_val="1.4"
min_val="0.75"
name="ui_scale_slider"
@@ -314,7 +315,7 @@ Automatic position for:
label="Other Devices"
left="30"
name="joystick_setup_button"
- top_pad="12"
+ top="27"
width="155">
<button.commit_callback
function="Floater.Show"
diff --git a/indra/newview/skins/default/xui/es/floater_tools.xml b/indra/newview/skins/default/xui/es/floater_tools.xml
index 59f953c239..5dc527c29a 100644
--- a/indra/newview/skins/default/xui/es/floater_tools.xml
+++ b/indra/newview/skins/default/xui/es/floater_tools.xml
@@ -67,7 +67,10 @@
<text name="RenderingCost" tool_tip="Muestra cuánto se calcula que cuesta renderizar este objeto">
þ: [COUNT]
</text>
- <check_box label="Estirar ambos lados" name="checkbox uniform"/>
+ <check_box name="checkbox uniform"/>
+ <text name="checkbox uniform label">
+ Estirar ambos lados
+ </text>
<check_box initial_value="true" label="Estirar las texturas" name="checkbox stretch textures"/>
<check_box initial_value="true" label="Usar la cuadrícula" name="checkbox snap to grid"/>
<combo_box name="combobox grid mode" tool_tip="Elige qué cuadricula usar para posicionar el objeto" width="82">
diff --git a/indra/newview/skins/default/xui/fr/floater_tools.xml b/indra/newview/skins/default/xui/fr/floater_tools.xml
index 16d276f8c2..cd86e77eb5 100644
--- a/indra/newview/skins/default/xui/fr/floater_tools.xml
+++ b/indra/newview/skins/default/xui/fr/floater_tools.xml
@@ -67,7 +67,10 @@
<text name="RenderingCost" tool_tip="Affiche le coût du rendu calculé pour cet objet">
þ : [COUNT]
</text>
- <check_box label="Étirer les deux côtés" name="checkbox uniform"/>
+ <check_box name="checkbox uniform"/>
+ <text name="checkbox uniform label">
+ Étirer les deux côtés
+ </text>
<check_box initial_value="true" label="Étirer les textures" name="checkbox stretch textures"/>
<check_box initial_value="true" label="Fixer sur la grille" name="checkbox snap to grid"/>
<combo_box name="combobox grid mode" tool_tip="Choisissez le type d&apos;axe de grille pour le positionnement de l&apos;objet">
diff --git a/indra/newview/skins/default/xui/it/floater_tools.xml b/indra/newview/skins/default/xui/it/floater_tools.xml
index cd16246f0f..04d61b97ff 100644
--- a/indra/newview/skins/default/xui/it/floater_tools.xml
+++ b/indra/newview/skins/default/xui/it/floater_tools.xml
@@ -67,7 +67,10 @@
<text name="RenderingCost" tool_tip="Mostra il costo di rendering calcolato per questo oggetto">
þ: [COUNT]
</text>
- <check_box label="Ridimens. simmetricamente" name="checkbox uniform"/>
+ <check_box name="checkbox uniform"/>
+ <text name="checkbox uniform label">
+ Ridimens. simmetricamente
+ </text>
<check_box initial_value="true" label="Ridimensiona le texture" name="checkbox stretch textures"/>
<check_box initial_value="true" label="Posiziona nella griglia" name="checkbox snap to grid"/>
<combo_box name="combobox grid mode" tool_tip="Scegli il tipo di righello per posizionare l&apos;oggetto">
diff --git a/indra/newview/skins/default/xui/ja/floater_tools.xml b/indra/newview/skins/default/xui/ja/floater_tools.xml
index a8261a7493..a7e687abeb 100644
--- a/indra/newview/skins/default/xui/ja/floater_tools.xml
+++ b/indra/newview/skins/default/xui/ja/floater_tools.xml
@@ -67,7 +67,10 @@
<text name="RenderingCost" tool_tip="このオブジェクトにかかるレンダリングコストを表示">
þ: [COUNT]
</text>
- <check_box label="両側を引伸ばす" left="116" name="checkbox uniform"/>
+ <check_box left="116" name="checkbox uniform"/>
+ <text name="checkbox uniform label">
+ 両側を引伸ばす
+ </text>
<check_box initial_value="true" label="テクスチャを引伸ばす" name="checkbox stretch textures"/>
<check_box initial_value="true" label="グリッドにスナップ" left_delta="27" name="checkbox snap to grid"/>
<combo_box left_delta="60" name="combobox grid mode" tool_tip="オブジェクトの配置に使うグリッドルーラを選択します" width="76">
diff --git a/indra/newview/skins/default/xui/nl/floater_tools.xml b/indra/newview/skins/default/xui/nl/floater_tools.xml
index 0f8392428f..212cac0a5b 100644
--- a/indra/newview/skins/default/xui/nl/floater_tools.xml
+++ b/indra/newview/skins/default/xui/nl/floater_tools.xml
@@ -33,7 +33,10 @@
<combo_box.item name="Reference" label="Referentie"
/>
</combo_box>
- <check_box left="136" label="Beide zijden uitrekken" name="checkbox uniform"/>
+ <check_box left="136" name="checkbox uniform"/>
+ <text name="checkbox uniform label">
+ Beide zijden uitrekken
+ </text>
<check_box left="136" label="Texturen uitrekken" name="checkbox stretch textures"/>
<check_box left="136" label="Gebruik grid" name="checkbox snap to grid"/>
<button label="Opties..." label_selected="Opties..." name="Options..." height="18" bottom_delta="-15"/>
diff --git a/indra/newview/skins/default/xui/pl/floater_tools.xml b/indra/newview/skins/default/xui/pl/floater_tools.xml
index 5bc3811ef6..5b4f99e9d1 100644
--- a/indra/newview/skins/default/xui/pl/floater_tools.xml
+++ b/indra/newview/skins/default/xui/pl/floater_tools.xml
@@ -67,7 +67,10 @@
<text name="RenderingCost" tool_tip="Pokazuje koszt renderowania tego obiektu">
þ: [COUNT]
</text>
- <check_box label="Rozciągnij 2 Strony" name="checkbox uniform"/>
+ <check_box name="checkbox uniform"/>
+ <text name="checkbox uniform label">
+ Rozciągnij 2 Strony
+ </text>
<check_box initial_value="true" label="Rozciągnij Teksturę" name="checkbox stretch textures"/>
<check_box initial_value="true" label="Użyj siatki" name="checkbox snap to grid"/>
<combo_box name="combobox grid mode" tool_tip="Wybierz rodzaj linijki siatki dla pozycjonowania obiektu">
diff --git a/indra/newview/skins/default/xui/pt/floater_tools.xml b/indra/newview/skins/default/xui/pt/floater_tools.xml
index 3068880599..74b45f1d1e 100644
--- a/indra/newview/skins/default/xui/pt/floater_tools.xml
+++ b/indra/newview/skins/default/xui/pt/floater_tools.xml
@@ -67,7 +67,10 @@
<text name="RenderingCost" tool_tip="Mostra o cálculo do custo de renderização do objeto">
þ: [COUNT]
</text>
- <check_box label="Esticar ambos os lados" name="checkbox uniform"/>
+ <check_box name="checkbox uniform"/>
+ <text name="checkbox uniform label">
+ Esticar ambos os lados
+ </text>
<check_box initial_value="true" label="Esticar texturas" name="checkbox stretch textures"/>
<check_box initial_value="true" label="Mostrar na grade" name="checkbox snap to grid"/>
<combo_box name="combobox grid mode" tool_tip="Selecione o tipo de régua da grade onde o objeto será colocado">