summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/textures/textures.xml20
-rw-r--r--indra/newview/skins/default/xui/da/panel_login.xml10
-rw-r--r--indra/newview/skins/default/xui/en/floater_avatar_textures.xml207
-rw-r--r--indra/newview/skins/default/xui/en/floater_customize.xml660
-rw-r--r--indra/newview/skins/default/xui/en/floater_day_cycle_options.xml59
-rw-r--r--indra/newview/skins/default/xui/en/floater_outgoing_call.xml2
-rw-r--r--indra/newview/skins/default/xui/en/floater_world_map.xml163
-rw-r--r--indra/newview/skins/default/xui/en/menu_attachment_self.xml131
-rw-r--r--indra/newview/skins/default/xui/en/menu_avatar_self.xml20
-rw-r--r--indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml2
-rw-r--r--indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml4
-rw-r--r--indra/newview/skins/default/xui/en/menu_inventory.xml25
-rw-r--r--indra/newview/skins/default/xui/en/menu_object.xml18
-rw-r--r--indra/newview/skins/default/xui/en/menu_participant_list.xml200
-rw-r--r--indra/newview/skins/default/xui/en/menu_save_outfit.xml4
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml28
-rw-r--r--indra/newview/skins/default/xui/en/panel_bottomtray.xml4
-rw-r--r--indra/newview/skins/default/xui/en/panel_generic_tip.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_navigation_bar.xml21
-rw-r--r--indra/newview/skins/default/xui/en/panel_outfit_edit.xml30
-rw-r--r--indra/newview/skins/default/xui/en/panel_people.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_place_profile.xml1
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_chat.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_region_estate.xml32
-rw-r--r--indra/newview/skins/default/xui/en/panel_scrolling_param.xml51
-rw-r--r--indra/newview/skins/default/xui/en/panel_toast.xml2
-rw-r--r--indra/newview/skins/default/xui/en/sidepanel_inventory.xml15
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml4
-rw-r--r--indra/newview/skins/default/xui/es/floater_day_cycle_options.xml10
-rw-r--r--indra/newview/skins/default/xui/es/floater_joystick.xml10
-rw-r--r--indra/newview/skins/default/xui/es/panel_region_general.xml2
-rw-r--r--indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml8
-rw-r--r--indra/newview/skins/default/xui/it/floater_day_cycle_options.xml10
-rw-r--r--indra/newview/skins/default/xui/ja/panel_preferences_sound.xml6
-rw-r--r--indra/newview/skins/default/xui/pl/floater_joystick.xml124
35 files changed, 926 insertions, 963 deletions
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 41bcc62220..84a99ba92a 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -522,8 +522,6 @@ with the same filename but different name
<!--WARNING OLD ART BELOW *do not use*-->
<texture name="icn_media_web.tga" preload="true" />
<texture name="icn_media_movie.tga" preload="true" />
- <texture name="icn_speaker-muted_dark.tga" />
- <texture name="icn_speaker_dark.tga" />
<texture name="icn_voice-localchat.tga" />
<texture name="icn_voice-groupfocus.tga" />
<texture name="icn_voice-pvtfocus.tga" />
@@ -545,10 +543,6 @@ with the same filename but different name
<texture name="tearoffbox.tga" />
<texture name="tearoff_pressed.tga" />
- <texture name="icn_label_music.tga" />
- <texture name="icn_label_media.tga" />
- <texture name="icn_rounded-text-field.tga" scale.left="14" scale.bottom="16" scale.top="16" scale.right="114" />
-
<texture name="color_swatch_alpha.tga" preload="true" />
<texture name="button_anim_pause.tga" />
@@ -582,20 +576,6 @@ with the same filename but different name
<texture name="notify_caution_icon.tga" />
- <texture name="icn_active-speakers-dot-lvl0.tga" />
- <texture name="icn_active-speakers-dot-lvl1.tga" />
- <texture name="icn_active-speakers-dot-lvl2.tga" />
-
- <texture name="icn_voice_ptt-off.tga" />
- <texture name="icn_voice_ptt-on.tga" />
- <texture name="icn_voice_ptt-on-lvl1.tga" />
- <texture name="icn_voice_ptt-on-lvl2.tga" />
- <texture name="icn_voice_ptt-on-lvl3.tga" />
- <texture name="icn_voice-call-end.tga" />
- <texture name="icn_voice-call-start.tga" />
-
- <texture name="mute_icon.tga" />
-
<texture name="default_land_picture.j2c" />
<texture name="default_profile_picture.j2c" />
<texture name="locked_image.j2c" />
diff --git a/indra/newview/skins/default/xui/da/panel_login.xml b/indra/newview/skins/default/xui/da/panel_login.xml
index d4bf9a7d78..1e60174909 100644
--- a/indra/newview/skins/default/xui/da/panel_login.xml
+++ b/indra/newview/skins/default/xui/da/panel_login.xml
@@ -11,10 +11,14 @@
</panel.string>
<layout_stack name="login_widgets">
<layout_panel name="login">
- <text name="username_text">
- Brugernavn:
+ <text name="first_name_text">
+ Fornavn:
</text>
- <line_editor label="Brugernavn" name="username_edit" tool_tip="[SECOND_LIFE] Brugernavn"/>
+ <line_editor label="Fornavn" name="first_name_edit" tool_tip="[SECOND_LIFE] First Name"/>
+ <text name="last_name_text">
+ Efternavn:
+ </text>
+ <line_editor label="Efternavn" name="last_name_edit" tool_tip="[SECOND_LIFE] Last Name"/>
<text name="password_text">
Password:
</text>
diff --git a/indra/newview/skins/default/xui/en/floater_avatar_textures.xml b/indra/newview/skins/default/xui/en/floater_avatar_textures.xml
index bac3ea86f1..e30e958543 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar_textures.xml
@@ -1,321 +1,306 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
legacy_header_height="18"
- height="700"
+ height="660"
layout="topleft"
name="avatar_texture_debug"
help_topic="avatar_texture_debug"
title="AVATAR TEXTURES"
- width="940"
- can_resize="true">
+ width="1253">
<floater.string
name="InvalidAvatar">
INVALID AVATAR
</floater.string>
-
- <scroll_container
- color="DkGray2"
- opaque="true"
- follows="all"
- height="680"
- layout="topleft"
- left="5"
- top_pad="15"
- name="profile_scroll"
- reserve_scroll_corner="false"
- width="930">
- <panel
- name="scroll_content_panel"
- follows="left|top"
- min_height="300"
- layout="topleft"
- top="0"
- background_visible="false"
- left="0"
- height="680">
<text
type="string"
length="1"
height="16"
layout="topleft"
- left="15"
+ left="30"
name="label"
- top="20"
- width="90">
- Baked
-Textures
+ top="40"
+ width="80">
+ Baked Textures
</text>
<text
type="string"
length="1"
height="16"
layout="topleft"
- left_pad="22"
+ left_pad="50"
name="composite_label"
top_delta="0"
width="120">
- Composite
-Textures
+ Composite Textures
</text>
<button
- height="40"
+ height="20"
label="Dump IDs to Console"
label_selected="Dump"
layout="topleft"
+ left_pad="530"
name="Dump"
top_delta="0"
- right="-10"
width="150" />
+ <scroll_container
+ color="DkGray2"
+ opaque="true"
+ follows="all"
+ height="590"
+ layout="topleft"
+ left="5"
+ top_pad="5"
+ name="profile_scroll"
+ reserve_scroll_corner="false"
+ width="1240">
<panel
name="scroll_content_panel"
follows="left|top"
min_height="300"
layout="topleft"
- top="43"
+ top="0"
background_visible="false"
- height="930"
+ height="950"
left="0"
- width="1230">
-
+ width="1250">
<texture_picker
- height="103"
+ height="143"
label="Hair"
layout="topleft"
left="10"
name="hair-baked"
top="17"
- width="92" />
+ width="128" />
<texture_picker
- height="103"
+ height="143"
label="Hair"
layout="topleft"
- left_pad="21"
+ left_pad="7"
name="hair_grain"
top_delta="0"
- width="92" />
+ width="128" />
<texture_picker
- height="103"
+ height="143"
label="Hair Alpha"
layout="topleft"
left_pad="7"
name="hair_alpha"
top_delta="0"
- width="92" />
+ width="128" />
<texture_picker
- height="103"
+ height="143"
label="Head"
layout="topleft"
left="10"
name="head-baked"
- top_delta="100"
- width="92" />
+ top="167"
+ width="128" />
<texture_picker
- height="103"
+ height="143"
label="Makeup"
layout="topleft"
- left_pad="21"
+ left_pad="7"
name="head_bodypaint"
top_delta="0"
- width="92" />
+ width="128" />
<texture_picker
- height="103"
+ height="143"
label="Head Alpha"
layout="topleft"
left_pad="7"
name="head_alpha"
top_delta="0"
- width="92" />
+ width="128" />
<texture_picker
- height="103"
+ height="143"
label="Head Tattoo"
layout="topleft"
left_pad="7"
name="head_tattoo"
top_delta="0"
- width="92" />
+ width="128" />
<texture_picker
- height="103"
+ height="143"
label="Eyes"
layout="topleft"
left="10"
name="eyes-baked"
- top_delta="100"
- width="92" />
+ top="317"
+ width="128" />
<texture_picker
- height="103"
+ height="143"
label="Eye"
layout="topleft"
- left_pad="21"
+ left_pad="7"
name="eyes_iris"
top_delta="0"
- width="92" />
+ width="128" />
<texture_picker
- height="103"
+ height="143"
label="Eyes Alpha"
layout="topleft"
left_pad="7"
name="eyes_alpha"
top_delta="0"
- width="92" />
+ width="128" />
<texture_picker
- height="103"
+ height="143"
label="Upper Body"
layout="topleft"
left="10"
name="upper-baked"
- top_delta="100"
- width="92" />
+ top="467"
+ width="128" />
<texture_picker
- height="103"
- label="Upper BodyPaint"
+ height="143"
+ label="Upper Body Bodypaint"
layout="topleft"
- left_pad="21"
+ left_pad="7"
name="upper_bodypaint"
top_delta="0"
- width="92" />
+ width="128" />
<texture_picker
- height="103"
+ height="143"
label="Undershirt"
layout="topleft"
left_pad="7"
name="upper_undershirt"
top_delta="0"
- width="92" />
+ width="128" />
<texture_picker
- height="103"
+ height="143"
label="Gloves"
layout="topleft"
left_pad="7"
name="upper_gloves"
top_delta="0"
- width="92" />
+ width="128" />
<texture_picker
- height="103"
+ height="143"
label="Shirt"
layout="topleft"
left_pad="7"
name="upper_shirt"
top_delta="0"
- width="92" />
+ width="128" />
<texture_picker
- height="103"
+ height="143"
label="Upper Jacket"
layout="topleft"
left_pad="7"
name="upper_jacket"
top_delta="0"
- width="92" />
+ width="128" />
<texture_picker
- height="103"
+ height="143"
label="Upper Alpha"
layout="topleft"
left_pad="7"
name="upper_alpha"
top_delta="0"
- width="92" />
+ width="128" />
<texture_picker
- height="103"
+ height="143"
label="Upper Tattoo"
layout="topleft"
left_pad="7"
name="upper_tattoo"
top_delta="0"
- width="92" />
+ width="128" />
<texture_picker
- height="103"
+ height="143"
label="Lower Body"
layout="topleft"
left="10"
name="lower-baked"
- top_delta="100"
- width="92" />
+ top="617"
+ width="128" />
<texture_picker
- height="103"
- label="Lower BodyPaint"
+ height="143"
+ label="Lower Body Bodypaint"
layout="topleft"
- left_pad="21"
+ left_pad="7"
name="lower_bodypaint"
top_delta="0"
- width="92" />
+ width="128" />
<texture_picker
- height="103"
+ height="143"
label="Underpants"
layout="topleft"
left_pad="7"
name="lower_underpants"
top_delta="0"
- width="92" />
+ width="128" />
<texture_picker
- height="103"
+ height="143"
label="Socks"
layout="topleft"
left_pad="7"
name="lower_socks"
top_delta="0"
- width="92" />
+ width="128" />
<texture_picker
- height="103"
+ height="143"
label="Shoes"
layout="topleft"
left_pad="7"
name="lower_shoes"
top_delta="0"
- width="92" />
+ width="128" />
<texture_picker
- height="103"
+ height="143"
label="Pants"
layout="topleft"
left_pad="7"
name="lower_pants"
top_delta="0"
- width="92" />
+ width="128" />
<texture_picker
- height="103"
+ height="143"
label="Jacket"
layout="topleft"
left_pad="7"
name="lower_jacket"
top_delta="0"
- width="92" />
+ width="128" />
<texture_picker
- height="103"
+ height="143"
label="Lower Alpha"
layout="topleft"
left_pad="7"
name="lower_alpha"
top_delta="0"
- width="92" />
+ width="128" />
<texture_picker
- height="103"
+ height="143"
label="Lower Tattoo"
layout="topleft"
left_pad="7"
name="lower_tattoo"
top_delta="0"
- width="92" />
+ width="128" />
<texture_picker
- height="103"
+ height="143"
label="Skirt"
layout="topleft"
left="10"
name="skirt-baked"
- top_delta="100"
- width="92" />
+ top="767"
+ width="128" />
<texture_picker
- height="103"
+ height="143"
label="Skirt"
layout="topleft"
- left_pad="21"
+ left_pad="7"
name="skirt"
top_delta="0"
- width="92" />
-</panel>
+ width="128" />
</panel>
</scroll_container>
-</floater> \ No newline at end of file
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_customize.xml b/indra/newview/skins/default/xui/en/floater_customize.xml
index 01bced81d0..32460e937d 100644
--- a/indra/newview/skins/default/xui/en/floater_customize.xml
+++ b/indra/newview/skins/default/xui/en/floater_customize.xml
@@ -11,7 +11,7 @@
save_rect="true"
title="APPEARANCE"
top_delta="-185"
- width="600">
+ width="524">
<tab_container
height="517"
layout="topleft"
@@ -21,7 +21,7 @@
tab_position="left"
tab_height="50"
top="26"
- width="580">
+ width="506">
<text
type="string"
length="1"
@@ -65,15 +65,15 @@
mouse_opaque="true"
width="16" />
<button
- follows="left|top"
+ follows="right|bottom"
height="23"
- label="Create New Shape"
- label_selected="Create New Shape"
+ label="Revert"
+ label_selected="Revert"
layout="topleft"
- left="10"
- name="Create New"
- top="104"
- width="160" />
+ right="390"
+ name="Revert"
+ top="477"
+ width="82" />
<button
follows="left|top"
height="23"
@@ -280,46 +280,46 @@
type="string"
length="1"
top="488"
- follows="left|top"
+ follows="left|top|right"
font="SansSerif"
halign="right"
height="23"
layout="topleft"
- left="10"
name="Item Action Label"
- width="130">
+ right="90"
+ width="100">
Shape:
</text>
<button
- follows="left|bottom"
+ follows="left|top"
+ height="23"
+ label="Create New Shape"
+ label_selected="Create New Shape"
+ layout="topleft"
+ left="10"
+ name="Create New"
+ top="104"
+ width="160" />
+ <button
+ follows="right|bottom"
height="23"
label="Save"
label_selected="Save"
layout="topleft"
name="Save"
- left_pad="2"
+ right="186"
top="477"
width="82" />
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Save As..."
label_selected="Save As..."
layout="topleft"
name="Save As"
top="477"
- left_pad="3"
+ right="304"
width="115" />
- <button
- follows="left|bottom"
- height="23"
- label="Revert"
- label_selected="Revert"
- layout="topleft"
- left_pad="3"
- name="Revert"
- top="477"
- width="120" />
</panel>
<panel
border="false"
@@ -352,16 +352,6 @@
<button
follows="left|top"
height="23"
- label="Create New Skin"
- label_selected="Create New Skin"
- layout="topleft"
- left_delta="0"
- name="Create New"
- top_delta="-249"
- width="160" />
- <button
- follows="left|top"
- height="23"
label="Skin Color"
label_selected="Skin Color"
layout="topleft"
@@ -489,6 +479,20 @@
width="373">
You do not have permission to modify this wearable.
</text>
+ <text
+ type="string"
+ length="1"
+ top="488"
+ follows="left|top|right"
+ font="SansSerif"
+ halign="right"
+ height="23"
+ layout="topleft"
+ name="Item Action Label"
+ right="90"
+ width="100">
+ Skin:
+ </text>
<texture_picker
allow_no_texture="true"
can_apply_immediately="true"
@@ -528,50 +532,46 @@
tool_tip="Click to choose a picture"
top_delta="102"
width="82" />
- <text
- type="string"
- length="1"
- top="488"
+ <button
follows="left|top"
- font="SansSerif"
- halign="right"
height="23"
+ label="Create New Skin"
+ label_selected="Create New Skin"
layout="topleft"
- left="10"
- name="Item Action Label"
- width="130">
- Skin:
- </text>
+ left_delta="0"
+ name="Create New"
+ top_delta="-249"
+ width="160" />
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Save"
label_selected="Save"
layout="topleft"
- left_pad="2"
+ right="186"
name="Save"
top="477"
width="82" />
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Save As..."
label_selected="Save As..."
layout="topleft"
- left_pad="3"
+ right="304"
name="Save As"
top="477"
width="115" />
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Revert"
label_selected="Revert"
layout="topleft"
- left_pad="3"
+ right="390"
name="Revert"
top="477"
- width="120" />
+ width="82" />
</panel>
<panel
border="false"
@@ -729,6 +729,20 @@
width="373">
You do not have permission to modify this wearable.
</text>
+ <text
+ type="string"
+ length="1"
+ top="488"
+ follows="left|top|right"
+ font="SansSerif"
+ halign="right"
+ height="23"
+ layout="topleft"
+ name="Item Action Label"
+ right="90"
+ width="100">
+ Hair:
+ </text>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
@@ -751,50 +765,36 @@
name="Create New"
top_delta="-89"
width="160" />
- <text
- type="string"
- length="1"
- top="488"
- follows="left|top"
- font="SansSerif"
- halign="right"
- height="23"
- layout="topleft"
- name="Item Action Label"
- left="10"
- width="130">
- Hair:
- </text>
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Save"
label_selected="Save"
layout="topleft"
- left_pad="2"
+ right="186"
name="Save"
top="477"
width="82" />
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Save As..."
label_selected="Save As..."
layout="topleft"
- left_pad="3"
+ right="304"
name="Save As"
top="477"
width="115" />
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Revert"
label_selected="Revert"
layout="topleft"
- left_pad="3"
+ right="390"
name="Revert"
top="477"
- width="120" />
+ width="82" />
</panel>
<panel
border="false"
@@ -914,6 +914,20 @@
width="373">
You do not have permission to modify this wearable.
</text>
+ <text
+ type="string"
+ length="1"
+ bottom="4"
+ follows="left|bottom|right"
+ font="SansSerif"
+ halign="right"
+ height="23"
+ layout="bottomleft"
+ name="Item Action Label"
+ right="90"
+ width="100">
+ Eyes:
+ </text>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
@@ -935,50 +949,36 @@
name="Create New"
top="66"
width="160" />
- <text
- type="string"
- length="1"
- bottom="4"
- follows="left|bottom"
- font="SansSerif"
- halign="right"
- height="23"
- layout="bottomleft"
- name="Item Action Label"
- left="10"
- width="130">
- Eyes:
- </text>
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Save"
label_selected="Save"
layout="topleft"
- left_pad="2"
+ right="186"
name="Save"
top="477"
width="82" />
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Save As..."
label_selected="Save As..."
layout="topleft"
- left_pad="3"
+ right="304"
name="Save As"
top="477"
width="115" />
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Revert"
label_selected="Revert"
layout="topleft"
- left_pad="3"
+ right="390"
name="Revert"
top="477"
- width="120" />
+ width="82" />
</panel>
<text
type="string"
@@ -1063,50 +1063,36 @@
name="Create New"
top="66"
width="160" />
- <text
- type="string"
- length="1"
- bottom="4"
- follows="left|bottom"
- font="SansSerif"
- halign="right"
- height="23"
- layout="bottomleft"
- name="Item Action Label"
- left="10"
- width="130">
- Shirt:
- </text>
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Save"
label_selected="Save"
layout="topleft"
- left_pad="2"
+ right="186"
name="Save"
top="477"
width="82" />
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Save As..."
label_selected="Save As..."
layout="topleft"
- left_pad="3"
+ right="304"
name="Save As"
top="477"
width="115" />
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Revert"
label_selected="Revert"
layout="topleft"
- left_pad="3"
+ right="390"
name="Revert"
top="477"
- width="120" />
+ width="82" />
<text
type="string"
length="1"
@@ -1197,6 +1183,20 @@
width="373">
You do not have permission to modify this wearable.
</text>
+ <text
+ type="string"
+ length="1"
+ bottom="4"
+ follows="left|bottom|right"
+ font="SansSerif"
+ halign="right"
+ height="23"
+ layout="bottomleft"
+ name="Item Action Label"
+ right="90"
+ width="100">
+ Shirt:
+ </text>
</panel>
<panel
border="false"
@@ -1266,50 +1266,36 @@
name="Create New"
top="66"
width="160" />
- <text
- type="string"
- length="1"
- bottom="4"
- follows="left|bottom"
- font="SansSerif"
- halign="right"
- height="23"
- layout="bottomleft"
- name="Item Action Label"
- left="10"
- width="130">
- Pants:
- </text>
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Save"
label_selected="Save"
layout="topleft"
- left_pad="2"
+ right="186"
name="Save"
top="477"
width="82" />
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Save As..."
label_selected="Save As..."
layout="topleft"
- left_pad="3"
+ right="304"
name="Save As"
top="477"
width="115" />
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Revert"
label_selected="Revert"
layout="topleft"
- left_pad="3"
+ right="390"
name="Revert"
top="477"
- width="120" />
+ width="82" />
<text
type="string"
length="1"
@@ -1400,6 +1386,20 @@
width="373">
You do not have permission to modify this wearable.
</text>
+ <text
+ type="string"
+ length="1"
+ bottom="4"
+ follows="left|bottom|right"
+ font="SansSerif"
+ halign="right"
+ height="23"
+ layout="bottomleft"
+ name="Item Action Label"
+ right="90"
+ width="100">
+ Pants:
+ </text>
</panel>
<panel
border="false"
@@ -1528,6 +1528,20 @@
width="373">
You do not have permission to modify this wearable.
</text>
+ <text
+ type="string"
+ length="1"
+ bottom="4"
+ follows="left|bottom|right"
+ font="SansSerif"
+ halign="right"
+ height="23"
+ layout="bottomleft"
+ name="Item Action Label"
+ right="90"
+ width="100">
+ Shoes:
+ </text>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
@@ -1559,50 +1573,36 @@
name="Take Off"
top_pad="4"
width="82" />
- <text
- type="string"
- length="1"
- bottom="4"
- follows="left|bottom"
- font="SansSerif"
- halign="right"
- height="23"
- layout="bottomleft"
- left="10"
- name="Item Action Label"
- width="130">
- Shoes:
- </text>
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Save"
label_selected="Save"
layout="topleft"
- left_pad="2"
+ right="186"
name="Save"
top="477"
width="82" />
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Save As..."
label_selected="Save As..."
layout="topleft"
- left_pad="3"
+ right="304"
name="Save As"
top="477"
width="115" />
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Revert"
label_selected="Revert"
layout="topleft"
- left_pad="3"
+ right="390"
name="Revert"
top="477"
- width="120" />
+ width="82" />
</panel>
<panel
border="false"
@@ -1731,6 +1731,20 @@
width="373">
You do not have permission to modify this wearable.
</text>
+ <text
+ type="string"
+ length="1"
+ bottom="4"
+ follows="left|bottom|right"
+ font="SansSerif"
+ halign="right"
+ height="23"
+ layout="bottomleft"
+ name="Item Action Label"
+ right="90"
+ width="100">
+ Socks:
+ </text>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
@@ -1762,50 +1776,36 @@
name="Take Off"
top_pad="4"
width="82" />
- <text
- type="string"
- length="1"
- bottom="4"
- follows="left|bottom"
- font="SansSerif"
- halign="right"
- height="23"
- layout="bottomleft"
- left="10"
- name="Item Action Label"
- width="130">
- Socks:
- </text>
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Save"
label_selected="Save"
layout="topleft"
- left_pad="2"
+ right="186"
name="Save"
top="477"
width="82" />
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Save As..."
label_selected="Save As..."
layout="topleft"
- left_pad="3"
+ right="304"
name="Save As"
top="477"
width="115" />
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Revert"
label_selected="Revert"
layout="topleft"
- left_pad="3"
+ right="390"
name="Revert"
top="477"
- width="120" />
+ width="82" />
</panel>
<panel
border="false"
@@ -1934,6 +1934,20 @@
width="373">
You do not have permission to modify this wearable.
</text>
+ <text
+ type="string"
+ length="1"
+ bottom="4"
+ follows="left|bottom|right"
+ font="SansSerif"
+ halign="right"
+ height="23"
+ layout="bottomleft"
+ name="Item Action Label"
+ right="90"
+ width="100">
+ Jacket:
+ </text>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
@@ -1976,50 +1990,36 @@
name="Take Off"
top_pad="4"
width="82" />
- <text
- type="string"
- length="1"
- bottom="4"
- follows="left|bottom"
- font="SansSerif"
- halign="right"
- height="23"
- layout="bottomleft"
- left="10"
- name="Item Action Label"
- width="130">
- Jacket:
- </text>
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Save"
label_selected="Save"
layout="topleft"
- left_pad="2"
+ right="186"
name="Save"
top="477"
width="82" />
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Save As..."
label_selected="Save As..."
layout="topleft"
- left_pad="3"
+ right="304"
name="Save As"
top="477"
width="115" />
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Revert"
label_selected="Revert"
layout="topleft"
- left_pad="3"
+ right="390"
name="Revert"
top="477"
- width="120" />
+ width="82" />
</panel>
<panel
border="false"
@@ -2148,6 +2148,20 @@
width="373">
You do not have permission to modify this wearable.
</text>
+ <text
+ type="string"
+ length="1"
+ bottom="4"
+ follows="left|bottom|right"
+ font="SansSerif"
+ halign="right"
+ height="23"
+ layout="bottomleft"
+ name="Item Action Label"
+ right="90"
+ width="100">
+ Gloves:
+ </text>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
@@ -2179,50 +2193,36 @@
name="Take Off"
top_pad="4"
width="82" />
- <text
- type="string"
- length="1"
- bottom="4"
- follows="left|bottom"
- font="SansSerif"
- halign="right"
- height="23"
- layout="bottomleft"
- left="10"
- name="Item Action Label"
- width="130">
- Gloves:
- </text>
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Save"
label_selected="Save"
layout="topleft"
- left_pad="2"
+ right="186"
name="Save"
top="477"
width="82" />
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Save As..."
label_selected="Save As..."
layout="topleft"
- left_pad="3"
+ right="304"
name="Save As"
top="477"
width="115" />
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Revert"
label_selected="Revert"
layout="topleft"
- left_pad="3"
+ right="390"
name="Revert"
top="477"
- width="120" />
+ width="82" />
</panel>
<panel
border="false"
@@ -2351,6 +2351,20 @@
width="373">
You do not have permission to modify this wearable.
</text>
+ <text
+ type="string"
+ length="1"
+ bottom="4"
+ follows="left|bottom|right"
+ font="SansSerif"
+ halign="right"
+ height="23"
+ layout="bottomleft"
+ name="Item Action Label"
+ right="90"
+ width="100">
+ Undershirt:
+ </text>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
@@ -2382,50 +2396,36 @@
name="Take Off"
top_pad="4"
width="82" />
- <text
- type="string"
- length="1"
- bottom="4"
- follows="left|bottom"
- font="SansSerif"
- halign="right"
- height="23"
- layout="bottomleft"
- left="10"
- name="Item Action Label"
- width="130">
- Undershirt:
- </text>
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Save"
label_selected="Save"
layout="topleft"
- left_pad="2"
+ right="186"
name="Save"
top="477"
width="82" />
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Save As..."
label_selected="Save As..."
layout="topleft"
- left_pad="3"
+ right="304"
name="Save As"
top="477"
width="115" />
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Revert"
label_selected="Revert"
layout="topleft"
- left_pad="3"
+ right="390"
name="Revert"
top="477"
- width="120" />
+ width="82" />
</panel>
<panel
border="false"
@@ -2554,6 +2554,20 @@
width="373">
You do not have permission to modify this wearable.
</text>
+ <text
+ type="string"
+ length="1"
+ bottom="4"
+ follows="left|bottom|right"
+ font="SansSerif"
+ halign="right"
+ height="23"
+ layout="bottomleft"
+ name="Item Action Label"
+ right="90"
+ width="100">
+ Underpants:
+ </text>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
@@ -2585,50 +2599,36 @@
name="Take Off"
top_pad="4"
width="82" />
- <text
- type="string"
- length="1"
- bottom="4"
- follows="left|bottom"
- font="SansSerif"
- halign="right"
- height="23"
- layout="bottomleft"
- left="10"
- name="Item Action Label"
- width="130">
- Underpants:
- </text>
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Save"
label_selected="Save"
layout="topleft"
- left_pad="2"
+ right="186"
name="Save"
top="477"
width="82" />
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Save As..."
label_selected="Save As..."
layout="topleft"
- left_pad="3"
+ right="304"
name="Save As"
top="477"
width="115" />
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Revert"
label_selected="Revert"
layout="topleft"
- left_pad="3"
+ right="390"
name="Revert"
top="477"
- width="120" />
+ width="82" />
</panel>
<panel
border="false"
@@ -2757,6 +2757,20 @@
width="373">
You do not have permission to modify this wearable.
</text>
+ <text
+ type="string"
+ length="1"
+ bottom="4"
+ follows="left|bottom|right"
+ font="SansSerif"
+ halign="right"
+ height="23"
+ layout="bottomleft"
+ name="Item Action Label"
+ right="90"
+ width="100">
+ Skirt:
+ </text>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
@@ -2788,50 +2802,36 @@
name="Take Off"
top_pad="4"
width="82" />
- <text
- type="string"
- length="1"
- bottom="4"
- follows="left|bottom"
- font="SansSerif"
- halign="right"
- height="23"
- layout="bottomleft"
- left="10"
- name="Item Action Label"
- width="130">
- Skirt:
- </text>
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Save"
label_selected="Save"
layout="topleft"
- left_pad="2"
+ right="186"
name="Save"
top="477"
width="82" />
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Save As..."
label_selected="Save As..."
layout="topleft"
- left_pad="3"
+ right="304"
name="Save As"
top="477"
width="115" />
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Revert"
label_selected="Revert"
layout="topleft"
- left_pad="3"
+ right="390"
name="Revert"
top="477"
- width="120" />
+ width="82" />
</panel>
<panel
border="false"
@@ -2960,6 +2960,20 @@
width="373">
You do not have permission to modify this wearable.
</text>
+ <text
+ type="string"
+ length="1"
+ bottom="4"
+ follows="left|bottom|right"
+ font="SansSerif"
+ halign="right"
+ height="23"
+ layout="bottomleft"
+ name="Item Action Label"
+ right="90"
+ width="100">
+ Tattoo:
+ </text>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
@@ -3004,50 +3018,36 @@
top_pad="4"
left="10"
width="82" />
- <text
- type="string"
- length="1"
- bottom="4"
- follows="left|bottom"
- font="SansSerif"
- halign="right"
- height="23"
- layout="bottomleft"
- left="10"
- name="Item Action Label"
- width="130">
- Tattoo:
- </text>
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Save"
label_selected="Save"
layout="topleft"
- left_pad="2"
+ right="186"
name="Save"
top="477"
width="82" />
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Save As..."
label_selected="Save As..."
layout="topleft"
- left_pad="3"
+ right="304"
name="Save As"
top="477"
width="115" />
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Revert"
label_selected="Revert"
layout="topleft"
- left_pad="3"
+ right="390"
name="Revert"
top="477"
- width="120" />
+ width="82" />
</panel>
<panel
border="false"
@@ -3176,6 +3176,20 @@
width="373">
You do not have permission to modify this wearable.
</text>
+ <text
+ type="string"
+ length="1"
+ bottom="4"
+ follows="left|bottom|right"
+ font="SansSerif"
+ halign="right"
+ height="23"
+ layout="bottomleft"
+ name="Item Action Label"
+ right="90"
+ width="100">
+ Alpha:
+ </text>
<texture_picker
can_apply_immediately="true"
default_image_name="Default"
@@ -3285,61 +3299,47 @@
left="10"
top_pad="20"
width="82" />
- <text
- type="string"
- length="1"
- bottom="4"
- follows="left|bottom"
- font="SansSerif"
- halign="right"
- height="23"
- layout="bottomleft"
- left="10"
- name="Item Action Label"
- width="130">
- Alpha:
- </text>
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Save"
label_selected="Save"
layout="topleft"
- left_pad="2"
+ right="186"
name="Save"
top="477"
width="82" />
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Save As..."
label_selected="Save As..."
layout="topleft"
- left_pad="3"
+ right="304"
name="Save As"
top="477"
width="115" />
<button
- follows="left|bottom"
+ follows="right|bottom"
height="23"
label="Revert"
label_selected="Revert"
layout="topleft"
- left_pad="3"
+ right="390"
name="Revert"
top="477"
- width="120" />
+ width="82" />
</panel>
</tab_container>
<scroll_container
follows="left|top|right|bottom"
height="409"
layout="topleft"
- left="247"
+ left="211"
mouse_opaque="false"
name="panel_container"
top="92"
- width="330">
+ width="292">
<scrolling_panel_list
follows="left|bottom"
layout="topleft"
@@ -3355,7 +3355,7 @@
name="script_info"
tool_tip="Show scripts attached to your avatar"
left="13"
- width="90" ></button>
+ width="90" />
<button
bottom="574"
follows="right|bottom"
diff --git a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
index 42a9ff551e..2c0c8d45b3 100644
--- a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml
@@ -7,7 +7,7 @@
help_topic="day_cycle_floater"
save_rect="true"
title="DAY CYCLE EDITOR"
- width="658">
+ width="646">
<tab_container
follows="left|top"
height="255"
@@ -16,7 +16,7 @@
name="Day Cycle Tabs"
tab_position="top"
top="20"
- width="656">
+ width="644">
<panel
border="true"
follows="left|top|right|bottom"
@@ -27,7 +27,7 @@
mouse_opaque="false"
name="Day Cycle"
top="0"
- width="654">
+ width="642">
<multi_slider
can_edit_text="true"
control_name="WLTimeSlider"
@@ -313,7 +313,7 @@
left="555"
name="WLAddKey"
top="30"
- width="96" />
+ width="80" />
<button
height="20"
label="Delete Key"
@@ -322,7 +322,7 @@
left_delta="0"
name="WLDeleteKey"
top_pad="5"
- width="96" />
+ width="80" />
<text
type="string"
length="1"
@@ -348,7 +348,7 @@
left="30"
name="WLCurKeyTimeText"
top="124"
- width="105">
+ width="100">
Key Time:
</text>
<spinner
@@ -361,11 +361,11 @@
label="Hour"
label_width="30"
layout="topleft"
- left_delta="25"
+ left_delta="0"
max_val="100"
name="WLCurKeyHour"
top_pad="4"
- width="74" />
+ width="70" />
<spinner
control_name="WLCurKeyMin"
decimal_digits="0"
@@ -402,7 +402,7 @@
left_delta="0"
name="WLKeyPresets"
top_pad="7"
- width="205" />
+ width="155" />
<view_border
bevel_style="none"
follows="top|left"
@@ -410,7 +410,7 @@
layout="topleft"
left="12"
top="101"
- width="240" />
+ width="190" />
<text
type="string"
length="1"
@@ -419,7 +419,7 @@
font="SansSerif"
height="16"
layout="topleft"
- left_pad="15"
+ left="220"
name="DayCycleText"
top="114"
width="120">
@@ -444,7 +444,7 @@
layout="topleft"
left_delta="0"
name="DayCycleText2"
- top_pad="17"
+ top_pad="9"
width="120">
Length of Cycle:
</text>
@@ -462,7 +462,7 @@
max_val="100"
name="WLLengthOfDayHour"
top_pad="4"
- width="74" />
+ width="70" />
<spinner
control_name="WLLengthOfDayMin"
decimal_digits="0"
@@ -492,58 +492,57 @@
max_val="59"
name="WLLengthOfDaySec"
top_delta="0"
- width="60"/>
+ width="60" />
<text
type="string"
- halign="right"
length="1"
border_visible="true"
follows="left|top|right"
font="SansSerif"
height="16"
layout="topleft"
- left_delta="-23"
+ left="310"
name="DayCycleText3"
top="114"
- width="85">
- Preview :
+ width="120">
+ Preview:
</text>
<button
height="20"
label="Play"
label_selected="Play"
layout="topleft"
- left="480"
+ left_delta="60"
name="WLAnimSky"
top_pad="5"
- width="83" />
+ width="50" />
<button
height="20"
label="Stop!"
label_selected="Stop"
layout="topleft"
- left_pad="4"
+ left_pad="5"
name="WLStopAnimSky"
top_delta="0"
- width="83" />
+ width="50" />
<button
height="20"
label="Use Estate Time"
label_selected="Go to Estate Time"
layout="topleft"
- left="480"
+ left_pad="5"
name="WLUseLindenTime"
- top_pad="9"
- width="170" />
+ top_delta="0"
+ width="150" />
<button
height="20"
label="Save Test Day"
label_selected="Save Test Day"
layout="topleft"
- left_delta="0"
+ left="480"
name="WLSaveDayCycle"
- top_pad="9"
- width="170" />
+ top="175"
+ width="150" />
<button
height="20"
label="Load Test Day"
@@ -551,8 +550,8 @@
layout="topleft"
left_delta="0"
name="WLLoadDayCycle"
- top_pad="3"
- width="170" />
+ top_pad="5"
+ width="150" />
</panel>
</tab_container>
</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
index 9db6568ee3..5ea207675b 100644
--- a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
@@ -119,7 +119,7 @@ No Answer. Please try again later.
layout="topleft"
left="77"
name="leaving"
- top="62"
+ top="52"
width="315"
word_wrap="true">
Leaving [CURRENT_CHAT].
diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index 20629018e2..233ab2c1b2 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -2,7 +2,8 @@
<floater
legacy_header_height="18"
can_resize="true"
- open_centered="true"
+ center_horiz="true"
+ center_vert="true"
height="600"
layout="topleft"
min_height="520"
@@ -178,16 +179,16 @@
width="90">
Land Sale
</text>
- <icon
- color="0.5 0.25 1 1"
+ <icon
+ color="1 1 0.25 1"
follows="top|right"
height="16"
image_name="legend.tga"
layout="topleft"
mouse_opaque="true"
name="square2"
- left="20"
- top_pad="2"
+ left="41"
+ top_pad="-2"
width="16" />
<text
type="string"
@@ -196,21 +197,21 @@
height="16"
layout="topleft"
left_pad="0"
- name="auction_label"
+ name="by_owner_label"
top_delta="3"
- width="170">
- land auction
+ width="100">
+ by owner
</text>
- <icon
- color="1 1 0.25 1"
+ <icon
+ color="0.5 0.25 1 1"
follows="top|right"
height="16"
image_name="legend.tga"
layout="topleft"
mouse_opaque="true"
name="square2"
- left="20"
- top_pad="-5"
+ left="41"
+ top_pad="-3"
width="16" />
<text
type="string"
@@ -219,10 +220,10 @@
height="16"
layout="topleft"
left_pad="0"
- name="by_owner_label"
+ name="auction_label"
top_delta="3"
- width="100">
- by owner
+ width="170">
+ land auction
</text>
<button
@@ -306,7 +307,7 @@
initial_value="true"
layout="topleft"
left="135"
- name="events_mature_chk"
+ name="event_mature_chk"
top_pad="3"
width="22" />
<icon
@@ -328,7 +329,7 @@
top_delta="2"
left_pad="3"
layout="topleft"
- name="events_mature_label"
+ name="mature_label"
width="66">
Moderate
</text>
@@ -339,7 +340,7 @@
height="16"
layout="topleft"
left="135"
- name="events_adult_chk"
+ name="event_adult_chk"
top_pad="3"
width="22" />
<icon
@@ -361,7 +362,7 @@
top_delta="2"
left_pad="3"
layout="topleft"
- name="events_adult_label"
+ name="adult_label"
width="66">
Adult
</text>
@@ -395,7 +396,7 @@
<panel
follows="right|top|bottom"
- height="330"
+ height="310"
top_pad="0"
width="238"
name="layout_panel_4">
@@ -534,69 +535,9 @@
<scroll_list.commit_callback
function="WMap.SearchResult" />
</scroll_list>
- <text
- type="string"
- length="1"
- follows="right|bottom"
- halign="right"
- height="16"
- layout="topleft"
- left="25"
- name="events_label"
- top_pad="16"
- width="70">
- Location:
- </text>
- <spinner
- control_name="Teleport_Coordinate_X"
- decimal_digits="0"
- follows="right|bottom"
- height="23"
- increment="1"
- initial_value="128"
- layout="topleft"
- left_delta="74"
- max_val="255"
- min_val="0"
- name="teleport_coordinate_x"
- width="44" >
- <spinner.commit_callback
- function="WMap.Coordinates" />
- </spinner>
- <spinner
- control_name="Teleport_Coordinate_Y"
- decimal_digits="0"
- follows="right|bottom"
- height="23"
- increment="1"
- initial_value="128"
- layout="topleft"
- left_delta="47"
- max_val="255"
- min_val="0"
- name="teleport_coordinate_y" >
- <spinner.commit_callback
- function="WMap.Coordinates" />
- </spinner>
- <spinner
- control_name="Teleport_Coordinate_Z"
- decimal_digits="0"
- follows="right|bottom"
- height="23"
- increment="1"
- initial_value="128"
- layout="topleft"
- left_delta="47"
- max_val="255"
- min_val="0"
- name="teleport_coordinate_z">
- <spinner.commit_callback
- function="WMap.Coordinates" />
- </spinner>
- <button
+ <button
follows="right|bottom"
height="23"
- image_unselected="PushButton_On"
label="Teleport"
layout="topleft"
left="25"
@@ -633,6 +574,66 @@
<button.commit_callback
function="WMap.ShowTarget" />
</button>
+
+<!-- <text
+ type="string"
+ length="1"
+ follows="bottom|right"
+ halign="left"
+ height="16"
+ top_pad="4"
+ left="25"
+ layout="topleft"
+ name="land_sale_label"
+ width="250">
+ Location:
+ </text>
+ <spinner
+ decimal_digits="0"
+ follows="bottom|right"
+ increment="1"
+ initial_value="128"
+ layout="topleft"
+ top_pad="0"
+ left="25"
+ max_val="255"
+ name="spin x"
+ tool_tip="X coordinate of location to show on map"
+ width="48">
+ <spinner.commit_callback
+ function="WMap.CommitLocation" />
+ </spinner>
+ <spinner
+ decimal_digits="0"
+ follows="bottom|right"
+ height="16"
+ increment="1"
+ initial_value="128"
+ layout="topleft"
+ left_pad="2"
+ max_val="255"
+ name="spin y"
+ tool_tip="Y coordinate of location to show on map"
+ top_delta="0"
+ width="48" >
+ <spinner.commit_callback
+ function="WMap.CommitLocation" />
+ </spinner>
+ <spinner
+ decimal_digits="0"
+ follows="bottom|right"
+ increment="1"
+ initial_value="0"
+ layout="topleft"
+ left_pad="2"
+ max_val="4096"
+ name="spin z"
+ tool_tip="Z coordinate of location to show on map"
+ top_delta="0"
+ width="48">
+ <spinner.commit_callback
+ function="WMap.CommitLocation" />
+ </spinner>-->
</panel>
<panel
follows="right|bottom"
diff --git a/indra/newview/skins/default/xui/en/menu_attachment_self.xml b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
index e2348375d5..5c30b9ee94 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
@@ -11,7 +11,8 @@
function="Object.Touch" />
<menu_item_call.on_enable
function="Object.EnableTouch"
- name="EnableTouch"/>
+ name="EnableTouch"
+ parameter="Touch" />
</menu_item_call>
<!--menu_item_call
label="Stand Up"
@@ -43,67 +44,61 @@
<menu_item_call.on_enable
function="Attachment.EnableDetach" />
</menu_item_call>
- <menu_item_separator
- layout="topleft" />
-
- <menu_item_call
-label="Stand Up"
-layout="topleft"
-name="Stand Up">
- <menu_item_call.on_click
- function="Self.StandUp"
- parameter="" />
- <menu_item_call.on_enable
- function="Self.EnableStandUp" />
- </menu_item_call>
- <menu_item_call
- label="Change Outfit"
- name="Change Outfit">
- <menu_item_call.on_click
- function="CustomizeAvatar" />
- <menu_item_call.on_enable
- function="Edit.EnableCustomizeAvatar" />
- </menu_item_call>
- <menu_item_call label="Edit My Outfit"
-layout="topleft"
-name="Edit Outfit">
- <menu_item_call.on_click
- function="EditOutfit" />
- <menu_item_call.on_enable
- function="Edit.EnableCustomizeAvatar" />
- </menu_item_call>
- <menu_item_call label="Edit My Shape"
- layout="topleft"
- name="Edit My Shape">
- <menu_item_call.on_click
- function="EditShape" />
- <menu_item_call.on_enable
- function="Edit.EnableEditShape" />
- </menu_item_call>
- <menu_item_call
- label="My Friends"
- layout="topleft"
- name="Friends...">
- <menu_item_call.on_click
- function="SideTray.PanelPeopleTab"
- parameter="friends_panel" />
- </menu_item_call>
- <menu_item_call
- label="My Groups"
- layout="topleft"
- name="Groups...">
- <menu_item_call.on_click
- function="SideTray.PanelPeopleTab"
- parameter="groups_panel" />
- </menu_item_call>
- <menu_item_call
- label="My Profile"
- layout="topleft"
- name="Profile...">
- <menu_item_call.on_click
- function="ShowAgentProfile"
- parameter="agent" />
- </menu_item_call>
+ <menu_item_call
+ enabled="false"
+ label="Drop"
+ layout="topleft"
+ name="Drop">
+ <menu_item_call.on_click
+ function="Attachment.Drop" />
+ <menu_item_call.on_enable
+ function="Attachment.EnableDrop" />
+ </menu_item_call>
+ <menu_item_separator
+ layout="topleft" />
+
+ <menu_item_call
+ label="Stand Up"
+ layout="topleft"
+ name="Stand Up">
+ <menu_item_call.on_click
+ function="Self.StandUp"
+ parameter="" />
+ <menu_item_call.on_enable
+ function="Self.EnableStandUp" />
+ </menu_item_call>
+ <menu_item_call
+ label="My Appearance"
+ name="Appearance...">
+ <menu_item_call.on_click
+ function="CustomizeAvatar" />
+ <menu_item_call.on_enable
+ function="Edit.EnableCustomizeAvatar" />
+ </menu_item_call>
+ <menu_item_call
+ label="My Friends"
+ layout="topleft"
+ name="Friends...">
+ <menu_item_call.on_click
+ function="SideTray.PanelPeopleTab"
+ parameter="friends_panel" />
+ </menu_item_call>
+ <menu_item_call
+ label="My Groups"
+ layout="topleft"
+ name="Groups...">
+ <menu_item_call.on_click
+ function="SideTray.PanelPeopleTab"
+ parameter="groups_panel" />
+ </menu_item_call>
+ <menu_item_call
+ label="My Profile"
+ layout="topleft"
+ name="Profile...">
+ <menu_item_call.on_click
+ function="ShowAgentProfile"
+ parameter="agent" />
+ </menu_item_call>
<menu_item_call
label="Debug Textures"
name="Debug...">
@@ -112,16 +107,4 @@ name="Edit Outfit">
<menu_item_call.on_visible
function="IsGodCustomerService"/>
</menu_item_call>
- <menu_item_separator
- layout="topleft" />
- <menu_item_call
- enabled="false"
- label="Drop"
- layout="topleft"
- name="Drop">
- <menu_item_call.on_click
- function="Attachment.Drop" />
- <menu_item_call.on_enable
- function="Attachment.EnableDrop" />
- </menu_item_call>
</context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_self.xml b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
index d5b993152a..a21c1ac44b 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
@@ -183,30 +183,14 @@
</menu_item_call>
</context_menu>
<menu_item_call
- label="Change Outfit"
+ label="My Appearance"
layout="topleft"
- name="Chenge Outfit">
+ name="Appearance...">
<menu_item_call.on_click
function="CustomizeAvatar" />
<menu_item_call.on_enable
function="Edit.EnableCustomizeAvatar" />
</menu_item_call>
- <menu_item_call label="Edit My Outfit"
- layout="topleft"
- name="Edit Outfit">
- <menu_item_call.on_click
- function="EditOutfit" />
- <menu_item_call.on_enable
- function="Edit.EnableCustomizeAvatar" />
- </menu_item_call>
- <menu_item_call label="Edit My Shape"
- layout="topleft"
- name="Edit My Shape">
- <menu_item_call.on_click
- function="EditShape" />
- <menu_item_call.on_enable
- function="Edit.EnableEditShape" />
- </menu_item_call>
<menu_item_call
label="My Friends"
layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
index a5ac5f76e1..334decdf58 100644
--- a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
@@ -89,7 +89,7 @@
function="InspectAvatar.VisibleFreezeEject"/>
</menu_item_call>
<menu_item_call
- label="Debug"
+ label="Debug Textures"
name="debug">
<menu_item_call.on_click
function="Avatar.Debug"/>
diff --git a/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml
index ea18e02ca1..03bd93e271 100644
--- a/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml
@@ -16,8 +16,8 @@
function="Self.EnableStandUp" />
</menu_item_call>
<menu_item_call
- label="Change Outfit"
- name="change_outfit">
+ label="My Appearance"
+ name="my_appearance">
<menu_item_call.on_click
function="CustomizeAvatar" />
<menu_item_call.on_enable
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index c0046d8e28..5e1f6b58e8 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -410,14 +410,6 @@
parameter="open" />
</menu_item_call>
<menu_item_call
- label="Open Original"
- layout="topleft"
- name="Open Original">
- <menu_item_call.on_click
- function="Inventory.DoToSelected"
- parameter="open_original" />
- </menu_item_call>
- <menu_item_call
label="Properties"
layout="topleft"
name="Properties">
@@ -472,7 +464,7 @@
layout="topleft"
name="Paste Separator" />
<menu_item_call
- label="Delete"
+ label="Remove Link"
layout="topleft"
name="Remove Link">
<menu_item_call.on_click
@@ -606,7 +598,7 @@
</menu_item_call>
<menu_item_separator
layout="topleft"
- name="Wearable And Object Separator"/>
+ name="Attach Separator"/>
<menu_item_call
label="Detach From Yourself"
layout="topleft"
@@ -629,10 +621,10 @@
<menu_item_call
label="Wear"
layout="topleft"
- name="Wearable And Object Wear">
+ name="Object Wear">
<menu_item_call.on_click
function="Inventory.DoToSelected"
- parameter="wear" />
+ parameter="attach" />
</menu_item_call>
<menu
label="Attach To"
@@ -642,6 +634,9 @@
label="Attach To HUD"
layout="topleft"
name="Attach To HUD" />
+ <menu_item_separator
+ layout="topleft"
+ name="Wearable Separator"/>
<menu_item_call
label="Edit"
layout="topleft"
@@ -651,12 +646,12 @@
parameter="edit" />
</menu_item_call>
<menu_item_call
- label="Add"
+ label="Wear"
layout="topleft"
- name="Wearable Add">
+ name="Wearable Wear">
<menu_item_call.on_click
function="Inventory.DoToSelected"
- parameter="wear_add" />
+ parameter="wear" />
</menu_item_call>
<menu_item_call
label="Take Off"
diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index b6cc222e96..8b10c7b049 100644
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -18,16 +18,16 @@
name="Edit...">
<menu_item_call.on_click
function="Object.Edit" />
- <menu_item_call.on_enable
+ <menu_item_call.on_visible
function="EnableEdit"/>
</menu_item_call>
<menu_item_call
label="Build"
name="Build">
<menu_item_call.on_click
- function="Object.Build" />
- <menu_item_call.on_enable
- function="EnableEdit"/>
+ function="Object.Edit" />
+ <menu_item_call.on_visible
+ function="VisibleBuild"/>
</menu_item_call>
<menu_item_call
enabled="false"
@@ -44,8 +44,11 @@
name="Object Sit">
<menu_item_call.on_click
function="Object.SitOrStand" />
+ <menu_item_call.on_visible
+ function="Object.SitVisible" />
<menu_item_call.on_enable
- function="Object.EnableSit" />
+ function="Object.EnableSitOrStand"
+ name="EnableSitOrStand" />
</menu_item_call>
<menu_item_call
enabled="false"
@@ -53,8 +56,11 @@
name="Object Stand Up">
<menu_item_call.on_click
function="Object.SitOrStand" />
+ <menu_item_call.on_visible
+ function="Object.StandUpVisible" />
<menu_item_call.on_enable
- function="Object.EnableStandUp" />
+ function="Object.EnableSitOrStand"
+ name="EnableSitOrStand" />
</menu_item_call>
<menu_item_call
label="Object Profile"
diff --git a/indra/newview/skins/default/xui/en/menu_participant_list.xml b/indra/newview/skins/default/xui/en/menu_participant_list.xml
index 4ed5807808..59c7f4ed85 100644
--- a/indra/newview/skins/default/xui/en/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/en/menu_participant_list.xml
@@ -6,41 +6,38 @@
label="Sort by Name"
layout="topleft"
name="SortByName">
- <on_check
- function="ParticipantList.CheckItem"
- parameter="is_sorted_by_name" />
- <on_click
+ <menu_item_check.on_click
function="ParticipantList.Sort"
parameter="sort_by_name" />
+ <menu_item_check.on_check
+ function="ParticipantList.CheckItem"
+ parameter="is_sorted_by_name" />
</menu_item_check>
<menu_item_check
label="Sort by Recent Speakers"
layout="topleft"
name="SortByRecentSpeakers">
- <on_check
- function="ParticipantList.CheckItem"
- parameter="is_sorted_by_recent_speakers" />
- <on_click
+ <menu_item_check.on_click
function="ParticipantList.Sort"
parameter="sort_by_recent_speakers" />
+ <menu_item_check.on_check
+ function="ParticipantList.CheckItem"
+ parameter="is_sorted_by_recent_speakers" />
</menu_item_check>
<menu_item_call
label="View Profile"
layout="topleft"
name="View Profile">
- <on_click
+ <menu_item_call.on_click
function="Avatar.Profile" />
- <on_enable
- function="ParticipantList.EnableItem"
- parameter="can_view_profile" />
</menu_item_call>
<menu_item_call
label="Add Friend"
layout="topleft"
name="Add Friend">
- <on_click
+ <menu_item_call.on_click
function="Avatar.AddFriend" />
- <on_enable
+ <menu_item_call.on_enable
function="ParticipantList.EnableItem"
parameter="can_add" />
</menu_item_call>
@@ -48,9 +45,9 @@
label="IM"
layout="topleft"
name="IM">
- <on_click
+ <menu_item_call.on_click
function="Avatar.IM" />
- <on_enable
+ <menu_item_call.on_enable
function="ParticipantList.EnableItem"
parameter="can_im" />
</menu_item_call>
@@ -58,19 +55,20 @@
label="Call"
layout="topleft"
name="Call">
- <on_click
+ <menu_item_call.on_click
function="Avatar.Call" />
- <on_enable
+ <menu_item_call.on_enable
function="ParticipantList.EnableItem"
parameter="can_call" />
</menu_item_call>
<menu_item_call
+ enabled="true"
label="Share"
layout="topleft"
name="Share">
- <on_click
+ <menu_item_call.on_click
function="Avatar.Share" />
- <on_enable
+ <menu_item_call.on_enable
function="ParticipantList.EnableItem"
parameter="can_share" />
</menu_item_call>
@@ -78,38 +76,37 @@
label="Pay"
layout="topleft"
name="Pay">
- <on_click
+ <menu_item_call.on_click
function="Avatar.Pay" />
- <on_enable
+ <menu_item_call.on_enable
function="ParticipantList.EnableItem"
parameter="can_pay" />
</menu_item_call>
<menu_item_separator
- layout="topleft"
- name="View Icons Separator" />
+ layout="topleft"
+ name="View Icons Separator" />
<menu_item_check
- label="View People Icons"
- layout="topleft"
- name="View Icons">
- <on_check
- function="CheckControl"
- parameter="ParticipantListShowIcons" />
- <on_click
- function="ToggleControl"
- parameter="ParticipantListShowIcons" />
+ label="View People Icons"
+ name="View Icons">
+ <on_click
+ function="ToggleControl"
+ parameter="ParticipantListShowIcons"/>
+ <on_check
+ function="CheckControl"
+ parameter="ParticipantListShowIcons" />
</menu_item_check>
<menu_item_separator
- layout="topleft" />
+ layout="topleft" />
<menu_item_check
label="Block Voice"
layout="topleft"
name="Block/Unblock">
- <on_check
+ <menu_item_check.on_click
+ function="Avatar.BlockUnblock" />
+ <menu_item_check.on_check
function="ParticipantList.CheckItem"
parameter="is_blocked" />
- <on_click
- function="Avatar.BlockUnblock" />
- <on_enable
+ <menu_item_check.on_enable
function="ParticipantList.EnableItem"
parameter="can_block" />
</menu_item_check>
@@ -126,72 +123,71 @@
function="ParticipantList.EnableItem"
parameter="can_mute_text" />
</menu_item_check>
- <menu_item_separator
- layout="topleft"
- name="Moderator Options Separator"/>
+ <menu_item_separator
+ layout="topleft" />
<context_menu
label="Moderator Options &gt;"
layout="topleft"
- name="Moderator Options">
- <menu_item_check
- label="Allow text chat"
- layout="topleft"
- name="AllowTextChat">
- <on_check
- function="ParticipantList.CheckItem"
- parameter="is_allowed_text_chat" />
- <on_click
- function="ParticipantList.ToggleAllowTextChat" />
- <on_enable
- function="ParticipantList.EnableItem"
- parameter="can_allow_text_chat" />
- </menu_item_check>
- <menu_item_separator
- layout="topleft"
- name="moderate_voice_separator" />
- <menu_item_call
- label="Mute this participant"
- layout="topleft"
- name="ModerateVoiceMuteSelected">
- <on_click
- function="ParticipantList.ModerateVoice"
- parameter="selected" />
- <on_enable
- function="ParticipantList.EnableItem.Moderate"
- parameter="can_moderate_voice" />
- </menu_item_call>
- <menu_item_call
- label="Unmute this participant"
- layout="topleft"
- name="ModerateVoiceUnMuteSelected">
- <on_click
- function="ParticipantList.ModerateVoice"
- parameter="selected" />
- <on_enable
- function="ParticipantList.EnableItem.Moderate"
- parameter="can_moderate_voice" />
- </menu_item_call>
- <menu_item_call
- label="Mute everyone"
- layout="topleft"
- name="ModerateVoiceMute">
- <on_click
- function="ParticipantList.ModerateVoice"
- parameter="mute_all" />
- <on_enable
- function="ParticipantList.EnableItem.Moderate"
- parameter="can_moderate_voice" />
- </menu_item_call>
- <menu_item_call
- label="Unmute everyone"
- layout="topleft"
- name="ModerateVoiceUnmute">
- <on_click
- function="ParticipantList.ModerateVoice"
- parameter="unmute_all" />
- <on_enable
- function="ParticipantList.EnableItem.Moderate"
- parameter="can_moderate_voice" />
- </menu_item_call>
+ name="Moderator Options" >
+ <menu_item_check
+ label="Allow text chat"
+ layout="topleft"
+ name="AllowTextChat">
+ <on_check
+ function="ParticipantList.CheckItem"
+ parameter="is_allowed_text_chat" />
+ <on_click
+ function="ParticipantList.ToggleAllowTextChat" />
+ <on_enable
+ function="ParticipantList.EnableItem"
+ parameter="can_allow_text_chat" />
+ </menu_item_check>
+ <menu_item_separator
+ layout="topleft"
+ name="moderate_voice_separator" />
+ <menu_item_call
+ label="Mute this participant"
+ layout="topleft"
+ name="ModerateVoiceMuteSelected">
+ <on_click
+ function="ParticipantList.ModerateVoice"
+ parameter="selected" />
+ <on_enable
+ function="ParticipantList.EnableItem"
+ parameter="can_moderate_voice" />
+ </menu_item_call>
+ <menu_item_call
+ label="Mute everyone else"
+ layout="topleft"
+ name="ModerateVoiceMuteOthers">
+ <on_click
+ function="ParticipantList.ModerateVoice"
+ parameter="others" />
+ <on_enable
+ function="ParticipantList.EnableItem"
+ parameter="can_moderate_voice" />
+ </menu_item_call>
+ <menu_item_call
+ label="Unmute this participant"
+ layout="topleft"
+ name="ModerateVoiceUnMuteSelected">
+ <on_click
+ function="ParticipantList.ModerateVoice"
+ parameter="selected" />
+ <on_enable
+ function="ParticipantList.EnableItem"
+ parameter="can_moderate_voice" />
+ </menu_item_call>
+ <menu_item_call
+ label="Unmute everyone else"
+ layout="topleft"
+ name="ModerateVoiceUnMuteOthers">
+ <on_click
+ function="ParticipantList.ModerateVoice"
+ parameter="others" />
+ <on_enable
+ function="ParticipantList.EnableItem"
+ parameter="can_moderate_voice" />
+ </menu_item_call>
</context_menu>
</context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_save_outfit.xml b/indra/newview/skins/default/xui/en/menu_save_outfit.xml
index 6285bf7417..a8778df7f6 100644
--- a/indra/newview/skins/default/xui/en/menu_save_outfit.xml
+++ b/indra/newview/skins/default/xui/en/menu_save_outfit.xml
@@ -14,9 +14,9 @@
</menu_item_call>
<menu_item_call
name="save_as_new_outfit"
- label="Save As">
+ label="Save As New">
<menu_item_call.on_click
- function="Outfit.SaveAs.Action"
+ function="Outfit.SaveAsNew.Action"
userdata="" />
</menu_item_call>
</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index e8ba8c683d..6c9564c8cf 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3380,6 +3380,13 @@ You can click &apos;Change Preference&apos; to raise your maturity Rating prefer
</notification>
<notification
+ icon="notifytip.tga"
+ name="PreferredMaturityChanged"
+ type="notifytip">
+Your maturity rating preference is now [RATING].
+ </notification>
+
+ <notification
icon="alertmodal.tga"
name="LandClaimAccessBlocked"
type="alertmodal">
@@ -4376,6 +4383,18 @@ Uploading in-world and web site snapshots...
</notification>
<notification
+ icon="alertmodal.tga"
+ name="UploadConfirmation"
+ type="alertmodal">
+Uploading costs L$[AMOUNT].
+Do you wish to proceed?
+ <usetemplate
+ name="okcancelbuttons"
+ notext="Cancel"
+ yestext="Upload"/>
+ </notification>
+
+ <notification
icon="notify.tga"
name="UploadPayment"
type="notify">
@@ -5146,7 +5165,7 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you th
type="offer">
[NAME_SLURL] has offered to teleport you to their location:
-[MESSAGE]
+[MESSAGE], ([MATURITY])
<form name="form">
<button
index="0"
@@ -5942,6 +5961,13 @@ Selected button can not be shown right now.
The button will be shown when there is enough space for it.
</notification>
+ <notification
+ icon="notifytip.tga"
+ name="ShareNotification"
+ type="notifytip">
+Drag items from inventory onto a person in the resident picker
+ </notification>
+
<global name="UnsupportedCPU">
- Your CPU speed does not meet the minimum requirements.
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index c34a367c32..e412c491fd 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -127,6 +127,8 @@
<gesture_combo_list.combo_button
pad_right="10"
use_ellipses="true" />
+ <gesture_combo_list.combo_list
+ page_lines="17" />
</gesture_combo_list>
</layout_panel>
<icon
@@ -344,7 +346,6 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
user_resize="false">
<chiclet_im_well
max_displayed_count="99"
- flash_period="0.3"
follows="right"
height="28"
layout="topleft"
@@ -393,7 +394,6 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well
min_width="37"
user_resize="false">
<chiclet_notification
- flash_period="0.25"
follows="right"
height="23"
layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_generic_tip.xml b/indra/newview/skins/default/xui/en/panel_generic_tip.xml
index eea92895f5..453ed7c7a6 100644
--- a/indra/newview/skins/default/xui/en/panel_generic_tip.xml
+++ b/indra/newview/skins/default/xui/en/panel_generic_tip.xml
@@ -3,7 +3,7 @@
height="40"
layout="topleft"
left="0"
- name="panel_generic_tip"
+ name="panel_system_tip"
top="0"
width="305">
<text
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index 2c9d7e4b6a..96c76576c0 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -22,25 +22,14 @@
width="600"/>
<icon
follows="all"
- image_name="NavBar_BG_NoFav_Bevel"
+ image_name="NavBar_BG_NoFav"
mouse_opaque="false"
- name="bg_icon_no_fav_bevel"
+ name="bg_icon_no_fav"
scale_image="true"
visible="false"
left="0"
top="0"
- height="60"
- width="600"/>
- <icon
- follows="all"
- image_name="NavBar_BG_NoNav_Bevel"
- mouse_opaque="false"
- name="bg_icon_no_nav_bevel"
- scale_image="true"
- visible="false"
- left="0"
- top="0"
- height="60"
+ height="50"
width="600"/>
<panel
background_visible="false"
@@ -124,6 +113,10 @@
<!-- top_delta="0" -->
<!-- width="168" /> -->
<search_combo_box
+ bevel_style="none"
+ border_style="line"
+ border.border_thickness="0"
+ commit_on_focus_lost="false"
follows="right|top"
halign="right"
height="23"
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 c1800384a3..9ece4aead8 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -211,7 +211,7 @@
image_selected="Toolbar_Middle_Selected"
image_unselected="Toolbar_Middle_Off"
layout="topleft"
- name="trash_btn"
+ name="remove_from_outfit_btn"
right="-1"
top="1"
width="31" />
@@ -257,7 +257,7 @@
text_pad_left="25" />
<inventory_panel
- allow_multi_select="true"
+ allow_multi_select="false"
border="false"
follows="left|top|right|bottom"
height="176"
@@ -317,6 +317,19 @@
name="list_view_btn"
top="1"
width="31" />
+ <button
+ follows="bottom|left"
+ height="25"
+ image_hover_unselected="Toolbar_Middle_Over"
+ image_overlay="AddItem_Off"
+ image_selected="Toolbar_Middle_Selected"
+ image_unselected="Toolbar_Middle_Off"
+ label=""
+ layout="topleft"
+ left_pad="1"
+ name="add_to_outfit_btn"
+ top="1"
+ width="31" />
</panel>
</layout_panel>
</layout_stack>
@@ -338,6 +351,19 @@
name="save_btn"
width="145" />
<button
+ follows="bottom|right"
+ height="23"
+ name="save_flyout_btn"
+ label=""
+ left_pad="-20"
+ tab_stop="false"
+ image_selected="SegmentedBtn_Right_Selected_Press"
+ image_unselected="SegmentedBtn_Right_Off"
+ image_pressed="SegmentedBtn_Right_Press"
+ image_pressed_selected="SegmentedBtn_Right_Selected_Press"
+ image_overlay="Arrow_Small_Up"
+ width="20"/>
+ <button
follows="bottom|left|right"
height="23"
left_pad="15"
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 8131b75b70..233137a76b 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -477,7 +477,7 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t
label="Share"
layout="topleft"
name="share_btn"
- width="62" />
+ width="85" />
<button
follows="bottom|left"
left_pad="3"
diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml
index a43b244fa0..9725e9952a 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -321,6 +321,7 @@
follows="all"
height="223"
layout="topleft"
+ single_expansion="true"
left="0"
name="advanced_info_accordion"
top_pad="10"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index ba967d3e2c..3ef16d2dec 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -330,7 +330,7 @@
<check_box
enabled="false"
height="16"
- label="Enable plain text IM and chat history"
+ label="Enable plain text chat history"
layout="topleft"
left_delta="0"
name="plain_text_chat_history"
diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml
index 08e36d5e57..9186efc431 100644
--- a/indra/newview/skins/default/xui/en/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml
@@ -2,14 +2,14 @@
<panel
border="false"
follows="top|left"
- height="510"
+ height="320"
help_topic="panel_region_estate_tab"
label="Estate"
layout="topleft"
left="0"
name="Estate"
top="320"
- width="530">
+ width="480">
<text
type="string"
length="1"
@@ -20,7 +20,7 @@
name="estate_help_text"
top="14"
word_wrap="true"
- width="300">
+ width="250">
Changes to settings on this tab will affect all regions in the estate.
</text>
<text
@@ -82,7 +82,7 @@
layout="topleft"
left_delta="-4"
top_pad="5"
- width="300" />
+ width="250" />
<check_box
height="20"
label="Use Global Time"
@@ -184,14 +184,14 @@
layout="topleft"
name="apply_btn"
top_pad="10"
- left="110"
+ left="78"
width="97" />
<button
follows="left|top"
height="23"
label="Send Message To Estate..."
layout="topleft"
- left="45"
+ left="20"
name="message_estate_btn"
top_pad="20"
width="220" />
@@ -200,7 +200,7 @@
height="23"
label="Kick Resident from Estate..."
layout="topleft"
- left="45"
+ left="20"
name="kick_user_from_estate_btn"
top_pad="5"
width="220" />
@@ -213,7 +213,7 @@
height="20"
layout="topleft"
name="estate_manager_label"
- right="520"
+ right="470"
width="200">
Estate Managers:
</text>
@@ -222,7 +222,7 @@
follows="top|left"
height="71"
layout="topleft"
- right="520"
+ right="470"
top_pad="-5"
width="200" />
<name_list
@@ -240,7 +240,7 @@
label="Remove..."
layout="topleft"
name="remove_estate_manager_btn"
- right="520"
+ right="470"
top_pad="5"
width="97" />
<button
@@ -269,7 +269,7 @@
follows="top|left"
height="71"
layout="topleft"
- right="520"
+ right="470"
top_pad="-5"
width="200" />
<name_list
@@ -287,7 +287,7 @@
label="Remove..."
layout="topleft"
name="remove_allowed_avatar_btn"
- right="520"
+ right="470"
top_pad="5"
width="97" />
<button
@@ -316,7 +316,7 @@
follows="top|left"
height="71"
layout="topleft"
- right="520"
+ right="470"
top_pad="-5"
width="200" />
<name_list
@@ -334,7 +334,7 @@
label="Remove..."
layout="topleft"
name="remove_allowed_group_btn"
- right="520"
+ right="470"
top_pad="5"
width="97" />
<button
@@ -363,7 +363,7 @@
follows="top|left"
height="71"
layout="topleft"
- right="520"
+ right="470"
top_pad="-5"
width="200" />
<name_list
@@ -381,7 +381,7 @@
label="Remove..."
layout="topleft"
name="remove_banned_avatar_btn"
- right="520"
+ right="470"
top_pad="5"
width="97" />
<button
diff --git a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
index f9c86fc75b..8042563900 100644
--- a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
+++ b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
- height="152"
+ height="157"
layout="topleft"
left="0"
name="LLScrollingPanelParam"
@@ -10,25 +10,25 @@
follows="left|top"
height="16"
layout="topleft"
- left="4"
+ left="12"
name="min param text"
- top="116"
- width="128" />
+ top="120"
+ width="120" />
<text
follows="left|top"
height="16"
layout="topleft"
- left_pad="6"
+ left="155"
name="max param text"
top_delta="0"
- width="128" />
+ width="120" />
<text
type="string"
length="1"
follows="left|top"
height="16"
layout="topleft"
- left="8"
+ left="12"
name="Loading..."
top="11"
width="128">
@@ -40,7 +40,7 @@
follows="left|top"
height="16"
layout="topleft"
- left_pad="6"
+ left="155"
name="Loading...2"
top_delta="0"
width="128">
@@ -49,30 +49,30 @@
<view_border
layout="topleft"
follows="left|top"
- left="2"
- top="0"
+ left="7"
+ top="5"
width="132"
height="132"
thickness="2"
- shadow_light_color="LtGray_50"
- highlight_light_color="LtGray_50"
- highlight_dark_color="LtGray_50"
- shadow_dark_color="LtGray_50"
+ shadow_light_color="0.3 0.3 0.3 1"
+ highlight_light_color="0.3 0.3 0.3 1"
+ highlight_dark_color="0.3 0.3 0.3 1"
+ shadow_dark_color="0.3 0.3 0.3 1"
bevel_style="in"
name="left_border"
/>
<view_border
layout="topleft"
follows="left|top"
- left_pad="2"
+ left_pad="10"
top_delta="0"
width="132"
height="132"
thickness="2"
- shadow_light_color="LtGray_50"
- highlight_light_color="LtGray_50"
- highlight_dark_color="LtGray_50"
- shadow_dark_color="LtGray_50"
+ shadow_light_color="0.3 0.3 0.3 1"
+ highlight_light_color="0.3 0.3 0.3 1"
+ highlight_dark_color="0.3 0.3 0.3 1"
+ shadow_dark_color="0.3 0.3 0.3 1"
bevel_style="in"
name="right_border"
/>
@@ -84,10 +84,10 @@
image_selected="PushButton_Selected"
image_unselected="PushButton_Off"
layout="topleft"
- left="2"
+ left="7"
name="less"
tab_stop="false"
- top="0"
+ top="5"
width="132" />
<button
enabled="false"
@@ -97,7 +97,7 @@
image_selected="PushButton_Selected"
image_unselected="PushButton_Off"
layout="topleft"
- left_pad="2"
+ left_pad="10"
name="more"
tab_stop="false"
top_delta="0"
@@ -111,10 +111,11 @@
initial_value="0"
label="[DESC]"
label_width="100"
- layout="topleft"
+ layout="bottom|left"
left="6"
max_val="100"
name="param slider"
- top="134"
- width="258" />
+ bottom="1"
+ width="274"
+ slider_label.font.style="BOLD" />
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml
index e7384fa77f..92b4c17247 100644
--- a/indra/newview/skins/default/xui/en/panel_toast.xml
+++ b/indra/newview/skins/default/xui/en/panel_toast.xml
@@ -55,7 +55,7 @@
clip_partial="true"
visible="false"
follows="left|top|right|bottom"
- font="SansSerifBold"
+ font="SansSerif"
height="20"
layout="topleft"
left="20"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 6c9acae35e..812d94c55f 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -45,7 +45,6 @@
layout="topleft"
left="0"
name="info_btn"
- tool_tip="Show object profile"
top="0"
width="102" />
<button
@@ -56,18 +55,6 @@
layout="topleft"
left="105"
name="share_btn"
- tool_tip="Share an inventory item"
- top="0"
- width="102" />
- <button
- enabled="true"
- follows="bottom|left"
- height="23"
- label="Shop"
- layout="topleft"
- left="210"
- name="shop_btn"
- tool_tip="Open Marketplace webpage"
top="0"
width="102" />
<button
@@ -78,7 +65,6 @@
layout="topleft"
left="210"
name="wear_btn"
- tool_tip="Wear seleceted outfit"
top="0"
width="102" />
<button
@@ -99,7 +85,6 @@
layout="topleft"
left="210"
name="teleport_btn"
- tool_tip="Teleport to the selected area"
top="0"
width="102" />
</panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 0c73b8d769..813f59ff89 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -148,6 +148,8 @@
<!-- Group name: text shown for LLUUID::null -->
<string name="GroupNameNone">(none)</string>
+ <string name="AvalineCaller">Avaline Caller [ORDER]</string>
+
<!-- Asset errors. Used in llassetstorage.cpp, translation from error code to error message. -->
<string name="AssetErrorNone">No error</string>
<string name="AssetErrorRequestFailed">Asset request: failed</string>
@@ -2940,6 +2942,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="IM_moderator_label">(Moderator)</string>
<!-- voice calls -->
+ <string name="answered_call">Your call has been answered</string>
<string name="started_call">Started a voice call</string>
<string name="joined_call">Joined the voice call</string>
@@ -3056,6 +3059,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<!-- Financial operations strings -->
<string name="paid_you_ldollars">[NAME] paid you L$[AMOUNT]</string>
<string name="you_paid_ldollars">You paid [NAME] L$[AMOUNT] [REASON].</string>
+ <string name="you_paid_ldollars_no_info">You paid L$[AMOUNT].</string>
<string name="you_paid_ldollars_no_reason">You paid [NAME] L$[AMOUNT].</string>
<string name="you_paid_ldollars_no_name">You paid L$[AMOUNT] [REASON].</string>
<string name="for a parcel of land">for a parcel of land</string>
diff --git a/indra/newview/skins/default/xui/es/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/es/floater_day_cycle_options.xml
index 9c3ac1be0e..47ad16b277 100644
--- a/indra/newview/skins/default/xui/es/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/es/floater_day_cycle_options.xml
@@ -57,8 +57,8 @@
<text name="WL12amHash2">
|
</text>
- <button label="Añadir un punto" label_selected="Añadir un punto" name="WLAddKey"/>
- <button label="Quitar un punto" label_selected="Quitar un punto" name="WLDeleteKey"/>
+ <button font="SansSerifSmall" width="96" left="546" label="Añadir un punto" label_selected="Añadir un punto" name="WLAddKey"/>
+ <button font="SansSerifSmall" width="96" left="546" label="Quitar un punto" label_selected="Quitar un punto" name="WLDeleteKey"/>
<text name="WLCurKeyFrameText">
Configuración del fotograma clave:
</text>
@@ -86,9 +86,9 @@
</text>
<button label="Probar" label_selected="Probar" name="WLAnimSky"/>
<button label="Parar" label_selected="Parar" name="WLStopAnimSky"/>
- <button label="Usar el horario del estado" label_selected="Ir al horario del estado" name="WLUseLindenTime"/>
- <button label="Guardar este tipo de día" label_selected="Guardar este tipo de día" name="WLSaveDayCycle"/>
- <button label="Cargar y probar un tipo de día" label_selected="Cargar y probar un tipo de día" name="WLLoadDayCycle"/>
+ <button width="150" font="SansSerifSmall" label="Usar el horario del estado" label_selected="Ir al horario del estado" name="WLUseLindenTime"/>
+ <button left="440" width="180" font="SansSerifSmall" label="Guardar este tipo de día" label_selected="Guardar este tipo de día" name="WLSaveDayCycle"/>
+ <button left="440" width="180" font="SansSerifSmall" label="Cargar y probar un tipo de día" label_selected="Cargar y probar un tipo de día" name="WLLoadDayCycle"/>
</panel>
</tab_container>
</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_joystick.xml b/indra/newview/skins/default/xui/es/floater_joystick.xml
index dbd2e4f04e..2c1804bd90 100644
--- a/indra/newview/skins/default/xui/es/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/es/floater_joystick.xml
@@ -16,7 +16,7 @@
Modos de control:
</text>
<check_box label="Avatar" name="JoystickAvatarEnabled"/>
- <check_box label="Construir" left="192" name="JoystickBuildEnabled"/>
+ <check_box label="Construir" name="JoystickBuildEnabled"/>
<check_box label="Flycam" name="JoystickFlycamEnabled"/>
<text name="XScale">
Escala: X
@@ -27,7 +27,7 @@
<text name="ZScale">
Escala: Z
</text>
- <text left="3" name="PitchScale" width="115">
+ <text name="PitchScale">
Escala: arriba/abajo
</text>
<text name="YawScale">
@@ -45,10 +45,10 @@
<text name="ZDeadZone">
Zona muerta Z
</text>
- <text left="3" name="PitchDeadZone" width="115">
+ <text name="PitchDeadZone">
Zona muerta arri./aba.
</text>
- <text left="3" name="YawDeadZone" width="115">
+ <text name="YawDeadZone">
Zona muerta izq./der.
</text>
<text name="RollDeadZone">
@@ -63,7 +63,7 @@
<text name="ZoomDeadZone">
Zona muerta zoom
</text>
- <button font="SansSerifSmall" label="Por defecto del SpaceNavigator" left="330" name="SpaceNavigatorDefaults" width="210"/>
+ <button font="SansSerifSmall" label="Por defecto del SpaceNavigator" name="SpaceNavigatorDefaults"/>
<button label="OK" label_selected="OK" left="330" name="ok_btn"/>
<button label="Cancelar" label_selected="Cancelar" left_delta="120" name="cancel_btn"/>
<stat_view label="Monitor del joystick" name="axis_view">
diff --git a/indra/newview/skins/default/xui/es/panel_region_general.xml b/indra/newview/skins/default/xui/es/panel_region_general.xml
index 9ee7bef493..67800b2c6f 100644
--- a/indra/newview/skins/default/xui/es/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_general.xml
@@ -32,7 +32,7 @@
</text>
<icons_combo_box label="&apos;Mature&apos;" name="access_combo">
<icons_combo_box.item label="&apos;Adult&apos;" name="Adult" value="42"/>
- <icons_combo_box.item label="&apos;Mature&apos;" name="Mature" value="21"/>
+ <icons_combo_box.item label="Moderado" name="Mature" value="21"/>
<icons_combo_box.item label="&apos;PG&apos;" name="PG" value="13"/>
</icons_combo_box>
<button label="Aplicar" name="apply_btn"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml
index a381f64cd9..e8122108a8 100644
--- a/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml
@@ -57,8 +57,8 @@
<text name="WL12amHash2">
|
</text>
- <button label="Ajouter clé" label_selected="Ajouter clé" name="WLAddKey" width="89" bottom="-45" />
- <button label="Supprimer clé" label_selected="Supprimer clé" name="WLDeleteKey" width="89" bottom="-70" />
+ <button label="Ajouter clé" label_selected="Ajouter clé" name="WLAddKey"/>
+ <button label="Supprimer clé" label_selected="Supprimer clé" name="WLDeleteKey" width="89"/>
<text name="WLCurKeyFrameText" width="170">
Réglages des images-clés :
</text>
@@ -81,10 +81,10 @@
<spinner label="Heure" name="WLLengthOfDayHour" label_width="80" width="74" />
<spinner label="Min" name="WLLengthOfDayMin" />
<spinner label="S" name="WLLengthOfDaySec" label_width="10" width="50" left_delta="95"/>
- <text name="DayCycleText3" left="280" width="200">
+ <text name="DayCycleText3">
Prévisualiser :
</text>
- <button label="Lire" label_selected="Lire" name="WLAnimSky" left_delta="90"/>
+ <button label="Lire" label_selected="Lire" name="WLAnimSky"/>
<button label="Stop !" label_selected="Stop" name="WLStopAnimSky" />
<button label="Utiliser heure domaine" label_selected="Aller heure domaine"
name="WLUseLindenTime" />
diff --git a/indra/newview/skins/default/xui/it/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/it/floater_day_cycle_options.xml
index 98c385d29f..808c758bb6 100644
--- a/indra/newview/skins/default/xui/it/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/it/floater_day_cycle_options.xml
@@ -57,8 +57,8 @@
<text name="WL12amHash2">
|
</text>
- <button label="Aggiungi voce" label_selected="Aggiungi voce" name="WLAddKey"/>
- <button label_selected="Cancella voce" name="WLDeleteKey"/>
+ <button font="SansSerifSmall" width="96" left="546" label="Aggiungi voce" label_selected="Aggiungi voce" name="WLAddKey"/>
+ <button font="SansSerifSmall" width="96" left="546" label="Cancella voce" label_selected="Cancella voce" name="WLDeleteKey"/>
<text name="WLCurKeyFrameText">
Impostazioni del fotogramma chiave:
</text>
@@ -84,9 +84,9 @@
<text name="DayCycleText3">
Anteprima:
</text>
- <button label="Avvia" label_selected="Avvia" name="WLAnimSky"/>
- <button label="Arresta!" label_selected="Arresta" name="WLStopAnimSky"/>
- <button label="Usa l&apos;ora della proprietà" label_selected="Vai all&apos;ora della proprietà" name="WLUseLindenTime"/>
+ <button width="55" font="SansSerifSmall" label="Avvia" label_selected="Avvia" name="WLAnimSky"/>
+ <button width="55" left_delta="60" font="SansSerifSmall" label="Arresta!" label_selected="Arresta" name="WLStopAnimSky"/>
+ <button left_delta="60" width="150" font="SansSerifSmall" label="Usa l&apos;ora della proprietà" label_selected="Vai all&apos;ora della proprietà" name="WLUseLindenTime"/>
<button label="Salva il test del giorno" label_selected="Salva il test del giorno" name="WLSaveDayCycle"/>
<button label="Carica il test del giorno" label_selected="Carica il test del giorno" name="WLLoadDayCycle"/>
</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
index 4f29ae7b44..abbd29286b 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
@@ -28,12 +28,6 @@
<panel.string name="default_text">
デフォルト
</panel.string>
- <panel.string name="default system device">
- デフォルトのシステム機器
- </panel.string>
- <panel.string name="no device">
- 機器が設定されていません
- </panel.string>
<text name="Input">
入力
</text>
diff --git a/indra/newview/skins/default/xui/pl/floater_joystick.xml b/indra/newview/skins/default/xui/pl/floater_joystick.xml
index 78742c39d1..2b1e362b98 100644
--- a/indra/newview/skins/default/xui/pl/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/pl/floater_joystick.xml
@@ -1,108 +1,108 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Joystick" title="KONFIGURACJA JOYSTICKA" width="590">
+<floater name="Joystick" title="KONFIGURACJA JOYSTICKA">
<check_box label="Aktywuj Joystick:" name="enable_joystick"/>
<text left="130" name="joystick_type" width="360"/>
<spinner label="Kalibracja Osi X" label_width="130" left="20" name="JoystickAxis1" width="170"/>
<spinner label="Kalibracja Osi Y" label_width="130" left="210" name="JoystickAxis2" width="170"/>
- <spinner label="Kalibracja Osi Z" label_width="130" left="400" name="JoystickAxis0" width="170"/>
+ <spinner label="Kalibracja Osi Z" label_width="100" left="400" name="JoystickAxis0" width="140"/>
<spinner label="Kalibracja wznoszenia" label_width="130" left="20" name="JoystickAxis4" width="170"/>
<spinner label="Kalibracja wychylania" label_width="130" left="210" name="JoystickAxis5" width="170"/>
- <spinner label="Kalibracja obrotu" label_width="130" left="400" name="JoystickAxis3" width="170"/>
+ <spinner label="Kalibracja obrotu" label_width="100" left="400" name="JoystickAxis3" width="140"/>
<spinner label="Kalibracja powiększania" label_width="130" name="JoystickAxis6" width="170"/>
<check_box label="Bezpośrednie" left="205" name="ZoomDirect"/>
<check_box label="Kursor 3D" left="340" name="Cursor3D"/>
<check_box label="Automatyczne" left="450" name="AutoLeveling"/>
- <text left="22" name="Control Modes:">
+ <text name="Control Modes:">
Kontroluj:
</text>
- <check_box label="Awatara" left="130" name="JoystickAvatarEnabled" width="90"/>
- <check_box label="Budowanie" left="205" name="JoystickBuildEnabled" width="90"/>
- <check_box label="Kamerę podczas latania" left="282" name="JoystickFlycamEnabled" width="90"/>
- <text name="XScale" width="104">
+ <check_box label="Awatara" name="JoystickAvatarEnabled" width="90"/>
+ <check_box label="Budowanie" name="JoystickBuildEnabled" width="90"/>
+ <check_box label="Kamerę podczas latania" left="300" name="JoystickFlycamEnabled" width="90"/>
+ <text name="XScale">
Skala X
</text>
- <spinner left="133" name="AvatarAxisScale1"/>
- <spinner left="208" name="BuildAxisScale1"/>
- <spinner left="283" name="FlycamAxisScale1"/>
- <text name="YScale" width="104">
+ <spinner name="AvatarAxisScale1"/>
+ <spinner name="BuildAxisScale1"/>
+ <spinner left="300" name="FlycamAxisScale1"/>
+ <text name="YScale">
Skala Y
</text>
- <spinner left="133" name="AvatarAxisScale2"/>
- <spinner left="208" name="BuildAxisScale2"/>
- <spinner left="283" name="FlycamAxisScale2"/>
- <text name="ZScale" width="104">
+ <spinner name="AvatarAxisScale2"/>
+ <spinner name="BuildAxisScale2"/>
+ <spinner left="300" name="FlycamAxisScale2"/>
+ <text name="ZScale">
Skala Z
</text>
- <spinner left="133" name="AvatarAxisScale0"/>
- <spinner left="208" name="BuildAxisScale0"/>
- <spinner left="283" name="FlycamAxisScale0"/>
- <text name="PitchScale" width="104">
+ <spinner name="AvatarAxisScale0"/>
+ <spinner name="BuildAxisScale0"/>
+ <spinner left="300" name="FlycamAxisScale0"/>
+ <text name="PitchScale">
Skala wznoszenia
</text>
- <spinner left="133" name="AvatarAxisScale4"/>
- <spinner left="208" name="BuildAxisScale4"/>
- <spinner left="283" name="FlycamAxisScale4"/>
- <text name="YawScale" width="104">
+ <spinner name="AvatarAxisScale4"/>
+ <spinner name="BuildAxisScale4"/>
+ <spinner left="300" name="FlycamAxisScale4"/>
+ <text name="YawScale">
Skala odchylania
</text>
- <spinner left="133" name="AvatarAxisScale5"/>
- <spinner left="208" name="BuildAxisScale5"/>
- <spinner left="283" name="FlycamAxisScale5"/>
- <text name="RollScale" width="104">
+ <spinner name="AvatarAxisScale5"/>
+ <spinner name="BuildAxisScale5"/>
+ <spinner left="300" name="FlycamAxisScale5"/>
+ <text name="RollScale">
Skala obrotu
</text>
- <spinner left="208" name="BuildAxisScale3"/>
- <spinner left="283" name="FlycamAxisScale3"/>
- <text name="XDeadZone" width="104">
+ <spinner name="BuildAxisScale3"/>
+ <spinner left="300" name="FlycamAxisScale3"/>
+ <text name="XDeadZone">
Tolerancja osi X
</text>
- <spinner left="133" name="AvatarAxisDeadZone1"/>
- <spinner left="208" name="BuildAxisDeadZone1"/>
- <spinner left="283" name="FlycamAxisDeadZone1"/>
- <text name="YDeadZone" width="104">
+ <spinner name="AvatarAxisDeadZone1"/>
+ <spinner name="BuildAxisDeadZone1"/>
+ <spinner left="300" name="FlycamAxisDeadZone1"/>
+ <text name="YDeadZone">
Tolerancja osi Y
</text>
- <spinner left="133" name="AvatarAxisDeadZone2"/>
- <spinner left="208" name="BuildAxisDeadZone2"/>
- <spinner left="283" name="FlycamAxisDeadZone2"/>
- <text name="ZDeadZone" width="104">
+ <spinner name="AvatarAxisDeadZone2"/>
+ <spinner name="BuildAxisDeadZone2"/>
+ <spinner left="300" name="FlycamAxisDeadZone2"/>
+ <text name="ZDeadZone">
Tolerancja osi Z
</text>
- <spinner left="133" name="AvatarAxisDeadZone0"/>
- <spinner left="208" name="BuildAxisDeadZone0"/>
- <spinner left="283" name="FlycamAxisDeadZone0"/>
- <text name="PitchDeadZone" width="104">
+ <spinner name="AvatarAxisDeadZone0"/>
+ <spinner name="BuildAxisDeadZone0"/>
+ <spinner left="300" name="FlycamAxisDeadZone0"/>
+ <text name="PitchDeadZone">
Tolerancja wznoszenia
</text>
- <spinner left="133" name="AvatarAxisDeadZone4"/>
- <spinner left="208" name="BuildAxisDeadZone4"/>
- <spinner left="283" name="FlycamAxisDeadZone4"/>
- <text name="YawDeadZone" width="104">
+ <spinner name="AvatarAxisDeadZone4"/>
+ <spinner name="BuildAxisDeadZone4"/>
+ <spinner left="300" name="FlycamAxisDeadZone4"/>
+ <text name="YawDeadZone">
Tolerancja odchylania
</text>
- <spinner left="133" name="AvatarAxisDeadZone5"/>
- <spinner left="208" name="BuildAxisDeadZone5"/>
- <spinner left="283" name="FlycamAxisDeadZone5"/>
- <text name="RollDeadZone" width="104">
+ <spinner name="AvatarAxisDeadZone5"/>
+ <spinner name="BuildAxisDeadZone5"/>
+ <spinner left="300" name="FlycamAxisDeadZone5"/>
+ <text name="RollDeadZone">
Tolerancja obrotu
</text>
- <spinner left="208" name="BuildAxisDeadZone3"/>
- <spinner left="283" name="FlycamAxisDeadZone3"/>
- <text name="Feathering" width="104">
+ <spinner name="BuildAxisDeadZone3"/>
+ <spinner left="300" name="FlycamAxisDeadZone3"/>
+ <text name="Feathering">
Przenikanie
</text>
- <slider label="" left="125" name="AvatarFeathering"/>
- <slider label="" left="200" name="BuildFeathering"/>
- <slider label="" left="275" name="FlycamFeathering"/>
- <text name="ZoomScale2" width="104">
+ <slider label="" name="AvatarFeathering"/>
+ <slider label="" name="BuildFeathering"/>
+ <slider label="" left_delta="81" name="FlycamFeathering"/>
+ <text name="ZoomScale2">
Skala powiększania
</text>
- <spinner label="" left="283" name="FlycamAxisScale6"/>
- <text name="ZoomDeadZone" width="104">
+ <spinner label="" left="300" name="FlycamAxisScale6"/>
+ <text name="ZoomDeadZone">
Tolerancja powiększania
</text>
- <spinner label="" left="283" name="FlycamAxisDeadZone6"/>
- <button label="Ustawienia domyślne" left="366" name="SpaceNavigatorDefaults"/>
+ <spinner label="" left="300" name="FlycamAxisDeadZone6"/>
+ <button label="Ustawienia domyślne" name="SpaceNavigatorDefaults"/>
<button label="OK" label_selected="OK" left="366" name="ok_btn"/>
<button label="Anuluj" label_selected="Anuluj" name="cancel_btn"/>
<stat_view label="Monitor Joysticka" name="axis_view">