summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
diff options
context:
space:
mode:
authorMatthew Breindel (Falcon) <falcon@lindenlab.com>2010-03-31 17:36:16 -0700
committerMatthew Breindel (Falcon) <falcon@lindenlab.com>2010-03-31 17:36:16 -0700
commit6a8df364063639f342592aa40c8aa490d3f73403 (patch)
treebe649cd320bf14c48b982135e58acb2353953a63 /indra/newview/skins/default/xui/en
parentb2381a039de7e0edbd643d198b85ba8e00524b6b (diff)
parent122308205b2958b27152b9dd5375554ef76dd084 (diff)
Merge
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r--indra/newview/skins/default/xui/en/floater_about_land.xml44
-rw-r--r--indra/newview/skins/default/xui/en/floater_animation_preview.xml30
-rw-r--r--indra/newview/skins/default/xui/en/floater_buy_currency.xml2
-rw-r--r--indra/newview/skins/default/xui/en/floater_im_session.xml4
-rw-r--r--indra/newview/skins/default/xui/en/floater_inventory.xml16
-rw-r--r--indra/newview/skins/default/xui/en/floater_preferences.xml5
-rw-r--r--indra/newview/skins/default/xui/en/floater_preview_notecard.xml4
-rw-r--r--indra/newview/skins/default/xui/en/floater_tools.xml196
-rw-r--r--indra/newview/skins/default/xui/en/floater_tos.xml4
-rw-r--r--indra/newview/skins/default/xui/en/main_view.xml46
-rw-r--r--indra/newview/skins/default/xui/en/menu_profile_overflow.xml9
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml3
-rw-r--r--indra/newview/skins/default/xui/en/panel_avatar_list_item.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml8
-rw-r--r--indra/newview/skins/default/xui/en/panel_bottomtray.xml11
-rw-r--r--indra/newview/skins/default/xui/en/panel_edit_pick.xml6
-rw-r--r--indra/newview/skins/default/xui/en/panel_edit_profile.xml4
-rw-r--r--indra/newview/skins/default/xui/en/panel_group_roles.xml4
-rw-r--r--indra/newview/skins/default/xui/en/panel_login.xml4
-rw-r--r--indra/newview/skins/default/xui/en/panel_main_inventory.xml63
-rw-r--r--indra/newview/skins/default/xui/en/panel_nearby_media.xml5
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_advanced.xml6
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_alerts.xml8
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_chat.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_general.xml4
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml283
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_privacy.xml9
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_setup.xml83
-rw-r--r--indra/newview/skins/default/xui/en/panel_prim_media_controls.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_profile.xml35
-rw-r--r--indra/newview/skins/default/xui/en/panel_status_bar.xml16
-rw-r--r--indra/newview/skins/default/xui/en/sidepanel_item_info.xml1
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml86
-rw-r--r--indra/newview/skins/default/xui/en/widgets/chat_history.xml1
34 files changed, 589 insertions, 417 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 2764befeac..51bd7a0a16 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -275,7 +275,7 @@ Leyla Linden </text>
left_pad="4"
right="-10"
name="Set..."
- width="50"
+ width="90"
top_delta="-2"/>
<check_box
enabled="false"
@@ -407,7 +407,7 @@ Leyla Linden </text>
name="Cancel Land Sale"
left_pad="5"
top_pad="-25"
- width="155" />
+ width="180" />
<text
type="string"
length="1"
@@ -486,10 +486,10 @@ Leyla Linden </text>
height="23"
label="Buy Land"
layout="topleft"
- left_delta="82"
+ left_delta="52"
name="Buy Land..."
top_pad="7"
- width="100" />
+ width="130" />
<button
enabled="true"
follows="left|top"
@@ -499,7 +499,7 @@ Leyla Linden </text>
left="10"
name="Scripts..."
top_pad="1"
- width="100" />
+ width="150" />
<button
enabled="false"
follows="left|top"
@@ -516,11 +516,11 @@ Leyla Linden </text>
height="23"
label="Buy Pass"
layout="topleft"
- left_delta="-105"
+ left_delta="-135"
name="Buy Pass..."
tool_tip="A pass gives you temporary access to this land."
top_delta="0"
- width="100" />
+ width="130" />
<button
follows="left|top"
height="23"
@@ -559,21 +559,26 @@ Leyla Linden </text>
left="0"
top="0"
help_topic="land_covenant_tab"
- name="land_covenant_panel">
+ name="land_covenant_panel"
+ word_wrap="true">
<panel.string
- name="can_resell">
+ name="can_resell"
+ word_wrap="true">
Purchased land in this region may be resold.
</panel.string>
<panel.string
- name="can_not_resell">
+ name="can_not_resell"
+ word_wrap="true">
Purchased land in this region may not be resold.
</panel.string>
<panel.string
- name="can_change">
+ name="can_change"
+ word_wrap="true">
Purchased land in this region may be joined or subdivided.
</panel.string>
<panel.string
- name="can_not_change">
+ name="can_not_change"
+ word_wrap="true">
Purchased land in this region may not be joined or subdivided.
</panel.string>
<text
@@ -748,6 +753,7 @@ Leyla Linden </text>
left_pad="10"
mouse_opaque="false"
name="resellable_clause"
+ word_wrap="true"
width="330">
Land in this region may not be resold.
</text>
@@ -1056,7 +1062,7 @@ Leyla Linden </text>
left="10"
name="Autoreturn"
top_pad="0"
- width="294">
+ width="310">
Auto return other Residents&apos; objects (minutes, 0 for off):
</text>
<line_editor
@@ -1234,7 +1240,7 @@ Only large parcels can be listed in search.
layout="topleft"
left_pad="2"
name="edit objects check"
- width="120" />
+ width="130" />
<check_box
height="16"
label="Group"
@@ -1260,7 +1266,7 @@ Only large parcels can be listed in search.
left_pad="2"
name="all object entry check"
top_delta="0"
- width="120" />
+ width="130" />
<check_box
height="16"
label="Group"
@@ -1287,7 +1293,7 @@ Only large parcels can be listed in search.
left_pad="2"
name="check other scripts"
top_delta="0"
- width="120" />
+ width="130" />
<check_box
height="16"
label="Group"
@@ -1341,7 +1347,7 @@ Only large parcels can be listed in search.
left="30"
name="land category with adult"
visible="false"
- width="130">
+ width="140">
<combo_box.item
label="Any Category"
name="item0"
@@ -1402,7 +1408,7 @@ Only large parcels can be listed in search.
left="30"
name="land category"
visible="false"
- width="130">
+ width="140">
<combo_box.item
label="Any Category"
name="item0"
@@ -1619,7 +1625,7 @@ Only large parcels can be listed in search.
layout="topleft"
left_pad="5"
name="set_media_url"
- width="50"
+ width="70"
top_delta="0"/>
<check_box
follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/floater_animation_preview.xml b/indra/newview/skins/default/xui/en/floater_animation_preview.xml
index 1ffedde29b..9dff4abe2c 100644
--- a/indra/newview/skins/default/xui/en/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_animation_preview.xml
@@ -218,14 +218,14 @@ Maximum animation length is [MAX_LENGTH] seconds.
increment="1"
initial_value="0"
label="In(%)"
- label_width="49"
+ label_width="70"
layout="topleft"
top_pad="5"
- left="30"
+ left="15"
max_val="100"
name="loop_in_point"
tool_tip="Sets point in animation that looping returns to"
- width="115" />
+ width="130" />
<spinner
bottom_delta="0"
follows="left|top"
@@ -238,8 +238,8 @@ Maximum animation length is [MAX_LENGTH] seconds.
max_val="100"
name="loop_out_point"
tool_tip="Sets point in animation that ends a loop"
- label_width="49"
- width="115" />
+ label_width="60"
+ width="120" />
<text
type="string"
length="1"
@@ -256,10 +256,10 @@ Maximum animation length is [MAX_LENGTH] seconds.
<combo_box
height="23"
layout="topleft"
- left_pad="0"
+ left_pad="20"
name="hand_pose_combo"
tool_tip="Controls what hands do during animation"
- width="150">
+ width="130">
<combo_box.item
label="Spread"
name="Spread"
@@ -328,9 +328,9 @@ Maximum animation length is [MAX_LENGTH] seconds.
</text>
<combo_box
height="23"
- width="150"
+ width="130"
layout="topleft"
- left_pad="0"
+ left_pad="20"
name="emote_combo"
tool_tip="Controls what face does during animation">
<combo_box.item
@@ -409,9 +409,9 @@ Maximum animation length is [MAX_LENGTH] seconds.
</text>
<combo_box
height="23"
- width="150"
+ width="130"
layout="topleft"
- left_pad="0"
+ left_pad="20"
name="preview_base_anim"
tool_tip="Use this to test your animation behavior while your avatar performs common actions.">
<combo_box.item
@@ -433,27 +433,27 @@ Maximum animation length is [MAX_LENGTH] seconds.
increment="0.01"
initial_value="0"
label="Ease In (sec)"
- label_width="110"
+ label_width="140"
layout="topleft"
left="10"
max_val="10"
name="ease_in_time"
tool_tip="Amount of time (in seconds) over which animations blends in"
top_pad="10"
- width="200" />
+ width="210" />
<spinner
follows="left|top"
height="23"
increment="0.01"
initial_value="0"
label="Ease Out (sec)"
- label_width="110"
+ label_width="140"
layout="topleft"
top_pad="0"
max_val="10"
name="ease_out_time"
tool_tip="Amount of time (in seconds) over which animations blends out"
- width="200" />
+ width="210" />
<button
follows="top|right"
height="23"
diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency.xml b/indra/newview/skins/default/xui/en/floater_buy_currency.xml
index 961bd6b5e4..e02d32596a 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_currency.xml
@@ -182,7 +182,7 @@
width="180"
layout="topleft"
name="buy_action">
- [NAME] L$ [PRICE]
+ [ACTION]
</text>
<text
type="string"
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 25016e0673..422e50f035 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -13,7 +13,7 @@
can_minimize="true"
can_close="true"
visible="false"
- width="360"
+ width="385"
can_resize="true"
min_width="250"
min_height="190">
@@ -22,7 +22,7 @@
default_tab_group="2"
follows="all"
height="320"
- width="360"
+ width="385"
layout="topleft"
orientation="horizontal"
name="im_panels"
diff --git a/indra/newview/skins/default/xui/en/floater_inventory.xml b/indra/newview/skins/default/xui/en/floater_inventory.xml
index 0d381fe5cb..ba2e0d3277 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory.xml
@@ -14,22 +14,6 @@
single_instance="false"
title="MY INVENTORY"
width="467">
- <floater.string
- name="Title">
- MY INVENTORY
- </floater.string>
- <floater.string
- name="TitleFetching">
- MY INVENTORY (Fetching [ITEM_COUNT] Items...) [FILTER]
- </floater.string>
- <floater.string
- name="TitleCompleted">
- MY INVENTORY ([ITEM_COUNT] Items) [FILTER]
- </floater.string>
- <floater.string
- name="Fetched">
- Fetched
- </floater.string>
<panel
bottom="560"
class="panel_main_inventory"
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index d7a7daf30c..49361784ae 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -10,7 +10,7 @@
help_topic="preferences"
single_instance="true"
title="PREFERENCES"
- width="620">
+ width="658">
<button
follows="right|bottom"
height="23"
@@ -39,6 +39,7 @@
</button>
<tab_container
follows="all"
+ halign="left"
height="410"
layout="topleft"
left="0"
@@ -48,7 +49,7 @@
tab_width="115"
tab_padding_right="5"
top="21"
- width="620">
+ width="658">
<panel
class="panel_preference"
filename="panel_preferences_general.xml"
diff --git a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
index ead5b8c8f2..e9099211a3 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
@@ -25,10 +25,6 @@
name="Title">
Notecard: [NAME]
</floater.string>
- <floater.string
- name="Save">
- Save
- </floater.string>
<icon
follows="top|right"
height="18"
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index fd6a5127d8..4d608fb00a 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -12,7 +12,7 @@
short_title="BUILD TOOLS"
single_instance="true"
sound_flags="0"
- width="280">
+ width="295">
<floater.string
name="status_rotate">
Drag colored bands to rotate object
@@ -152,7 +152,7 @@
left="8"
name="text status"
top_pad="3"
- width="275">
+ width="285">
Drag to move, shift-drag to copy
</text>
<radio_group
@@ -249,10 +249,10 @@
<check_box
left="10"
follows="left|top"
- height="16"
+ height="28"
control_name="EditLinkedParts"
label="Edit linked"
- layout="topleft"
+ layout="topleft"
name="checkbox edit linked parts" >
<check_box.commit_callback
function="BuildTool.selectComponent"/>
@@ -265,7 +265,7 @@
left="13"
name="RenderingCost"
tool_tip="Shows the rendering cost calculated for this object"
- top_pad="9"
+ top_pad="2"
type="string"
width="100">
รพ: [COUNT]
@@ -330,7 +330,7 @@
top_delta="0"
right="-10"
width="18"
- height="19" >
+ height="23" >
<button.commit_callback
function="BuildTool.gridOptions"/>
</button>
@@ -342,7 +342,7 @@
image_selected="Object_Cube_Selected"
image_unselected="Object_Cube"
layout="topleft"
- left="4"
+ left="10"
name="ToolCube"
tool_tip="Cube"
top="51"
@@ -355,7 +355,7 @@
image_selected="Object_Prism_Selected"
image_unselected="Object_Prism"
layout="topleft"
- left_delta="26"
+ left_delta="29"
name="ToolPrism"
tool_tip="Prism"
top_delta="0"
@@ -368,7 +368,7 @@
image_selected="Object_Pyramid_Selected"
image_unselected="Object_Pyramid"
layout="topleft"
- left_delta="26"
+ left_delta="29"
name="ToolPyramid"
tool_tip="Pyramid"
top_delta="0"
@@ -381,7 +381,7 @@
image_selected="Object_Tetrahedron_Selected"
image_unselected="Object_Tetrahedron"
layout="topleft"
- left_delta="26"
+ left_delta="29"
name="ToolTetrahedron"
tool_tip="Tetrahedron"
top_delta="0"
@@ -394,7 +394,7 @@
image_selected="Object_Cylinder_Selected"
image_unselected="Object_Cylinder"
layout="topleft"
- left_delta="26"
+ left_delta="29"
name="ToolCylinder"
tool_tip="Cylinder"
top_delta="0"
@@ -407,7 +407,7 @@
image_selected="Object_Hemi_Cylinder_Selected"
image_unselected="Object_Hemi_Cylinder"
layout="topleft"
- left_delta="26"
+ left_delta="29"
name="ToolHemiCylinder"
tool_tip="Hemicylinder"
top_delta="0"
@@ -420,7 +420,7 @@
image_selected="Object_Cone_Selected"
image_unselected="Object_Cone"
layout="topleft"
- left_delta="26"
+ left_delta="29"
name="ToolCone"
tool_tip="Cone"
top_delta="0"
@@ -433,7 +433,7 @@
image_selected="Object_Hemi_Cone_Selected"
image_unselected="Object_Hemi_Cone"
layout="topleft"
- left_delta="26"
+ left_delta="29"
name="ToolHemiCone"
tool_tip="Hemicone"
top_delta="0"
@@ -446,7 +446,7 @@
image_selected="Object_Sphere_Selected"
image_unselected="Object_Sphere"
layout="topleft"
- left_delta="26"
+ left_delta="29"
name="ToolSphere"
tool_tip="Sphere"
top_delta="0"
@@ -459,7 +459,7 @@
image_selected="Object_Hemi_Sphere_Selected"
image_unselected="Object_Hemi_Sphere"
layout="topleft"
- left_delta="26"
+ left_delta="29"
name="ToolHemiSphere"
tool_tip="Hemisphere"
top_delta="0"
@@ -472,7 +472,7 @@
image_selected="Object_Torus_Selected"
image_unselected="Object_Torus"
layout="topleft"
- left="4"
+ left="10"
name="ToolTorus"
tool_tip="Torus"
top="77"
@@ -485,7 +485,7 @@
image_selected="Object_Tube_Selected"
image_unselected="Object_Tube"
layout="topleft"
- left_delta="26"
+ left_delta="29"
name="ToolTube"
tool_tip="Tube"
top_delta="0"
@@ -498,7 +498,7 @@
image_selected="Object_Ring_Selected"
image_unselected="Object_Ring"
layout="topleft"
- left_delta="26"
+ left_delta="29"
name="ToolRing"
tool_tip="Ring"
top_delta="0"
@@ -511,7 +511,7 @@
image_selected="Object_Tree_Selected"
image_unselected="Object_Tree"
layout="topleft"
- left_delta="26"
+ left_delta="29"
name="ToolTree"
tool_tip="Tree"
top_delta="0"
@@ -525,7 +525,7 @@
image_unselected="Object_Grass"
image_overlay_color="Red"
layout="topleft"
- left_delta="26"
+ left_delta="29"
name="ToolGrass"
tool_tip="Grass"
top_delta="0"
@@ -639,7 +639,7 @@
follows="left|top"
height="12"
layout="topleft"
- left="150"
+ left="135"
name="Bulldozer:"
top="57"
width="100">
@@ -697,7 +697,7 @@
</slider_bar>
<button
follows="left|top"
- height="19"
+ height="23"
label="Apply"
label_selected="Apply"
top_pad="5"
@@ -705,7 +705,7 @@
left="135"
name="button apply to selection"
tool_tip="Modify selected land"
- width="78">
+ width="82">
<button.commit_callback
function="BuildTool.applyToSelection"/>
</button>
@@ -713,13 +713,13 @@
text_color="LtGray_50"
type="string"
length="1"
- height="12"
+ height="10"
follows="left|top"
halign="right"
layout="topleft"
right="-10"
name="obj_count"
- top_pad="6"
+ top_pad="5"
width="143">
Objects: [COUNT]
</text>
@@ -741,12 +741,12 @@
halign="center"
left="0"
name="Object Info Tabs"
- tab_max_width="54"
+ tab_max_width="100"
tab_min_width="40"
tab_position="top"
tab_height="25"
top="170"
- width="280">
+ width="295">
<panel
border="false"
follows="all"
@@ -756,8 +756,8 @@
help_topic="toolbox_general_tab"
name="General"
top="16"
- width="280">
- <panel.string
+ width="295">
+<panel.string
name="text deed continued">
Deed
</panel.string>
@@ -922,13 +922,13 @@
width="150" />
<button
follows="top|left"
- height="20"
+ height="23"
label="Deed"
label_selected="Deed"
layout="topleft"
name="button deed"
top_pad="0"
- left="100"
+ left="108"
tool_tip="Deeding gives this item away with next owner permissions. Group shared objects can be deeded by a group officer."
width="80" />
<check_box
@@ -949,12 +949,12 @@
top_pad="15"
left="10"
name="label click action"
- width="90">
+ width="98">
Click to:
</text>
<combo_box
follows="left|top"
- height="20"
+ height="23"
layout="topleft"
name="clickaction"
width="168"
@@ -985,25 +985,24 @@
value="Zoom" />
</combo_box>
<check_box
- height="16"
- top_pad="15"
+ height="23"
label="For Sale:"
layout="topleft"
name="checkbox for sale"
left="7"
- width="93" />
+ width="100" />
<!-- NEW SALE TYPE COMBO BOX -->
<combo_box
- left_pad="3"
+ left_pad="0"
layout="topleft"
follows="left|top"
allow_text_entry="false"
- height="20"
+ height="23"
intial_value="2"
max_chars="20"
mouse_opaque="true"
name="sale type"
- width="158">
+ width="168">
<combo_box.item
name="Copy"
label="Copy"
@@ -1026,12 +1025,12 @@ even though the user gets a free copy.
decimal_digits="0"
increment="1"
top_pad="8"
- left="100"
+ left="108"
control_name="Edit Cost"
name="Edit Cost"
label="Price: L$"
label_width="65"
- width="150"
+ width="165"
min_val="0"
height="20"
max_val="999999999" />
@@ -1055,7 +1054,7 @@ even though the user gets a free copy.
left="0"
top="241"
height="130"
- width="278">
+ width="290">
<text
type="string"
length="1"
@@ -1082,7 +1081,7 @@ even though the user gets a free copy.
label="Move"
layout="topleft"
name="checkbox allow everyone move"
- left="15"
+ left="10"
width="85" />
<check_box
height="19"
@@ -1104,9 +1103,9 @@ even though the user gets a free copy.
follows="left|top|right"
label="Modify"
layout="topleft"
- left="5"
+ left="10"
name="checkbox next owner can modify"
- width="80" />
+ width="85" />
<check_box
follows="left|top|right"
height="19"
@@ -1212,7 +1211,7 @@ even though the user gets a free copy.
help_topic="toolbox_object_tab"
name="Object"
top="16"
- width="280">
+ width="295">
<check_box
height="19"
label="Locked"
@@ -1586,7 +1585,7 @@ even though the user gets a free copy.
layout="topleft"
left="125"
name="text hollow"
- top_pad="5"
+ top_pad="6"
width="68">
Hollow
</text>
@@ -1634,16 +1633,16 @@ even though the user gets a free copy.
layout="topleft"
left="125"
name="Hollow Shape"
- top_pad="0"
+ top_pad="4"
width="150">
Hollow Shape
</text>
<combo_box
- height="19"
+ height="23"
layout="topleft"
left_delta="0"
name="hole"
- top_pad="3"
+ top_pad="-2"
width="150">
<combo_box.item
label="Default"
@@ -1915,7 +1914,7 @@ even though the user gets a free copy.
layout="topleft"
left="125"
name="text radius delta"
- top_pad="0"
+ top_pad="2"
width="78">
Radius
</text>
@@ -2035,7 +2034,6 @@ even though the user gets a free copy.
value="Mesh" />
</combo_box>
</panel>
-
<panel
border="false"
follows="all"
@@ -2047,7 +2045,7 @@ even though the user gets a free copy.
help_topic="toolbox_features_tab"
name="Features"
top_delta="0"
- width="280">
+ width="295">
<text
type="string"
length="1"
@@ -2285,7 +2283,7 @@ even though the user gets a free copy.
help_topic="toolbox_texture_tab"
name="Texture"
top_delta="0"
- width="280">
+ width="295">
<panel.string
name="string repeats per meter">
Repeats Per Meter
@@ -2349,7 +2347,7 @@ even though the user gets a free copy.
layout="topleft"
left_delta="0"
name="glow label"
- top_pad="2"
+ top_pad="8"
width="80">
Glow
</text>
@@ -2380,7 +2378,7 @@ even though the user gets a free copy.
left="10"
name="tex gen"
top_pad="5"
- width="85">
+ width="90">
Mapping
</text>
<combo_box
@@ -2389,7 +2387,7 @@ even though the user gets a free copy.
left_delta="0"
name="combobox texgen"
top_pad="4"
- width="85">
+ width="90">
<combo_box.item
label="Default"
name="Default"
@@ -2408,7 +2406,7 @@ even though the user gets a free copy.
name="label shininess"
left_pad="4"
top_pad="-36"
- width="85">
+ width="90">
Shininess
</text>
<combo_box
@@ -2417,7 +2415,7 @@ even though the user gets a free copy.
left_delta="0"
name="combobox shininess"
top_pad="4"
- width="85">
+ width="90">
<combo_box.item
label="None"
name="None"
@@ -2444,7 +2442,7 @@ even though the user gets a free copy.
left_pad="4"
name="label bumpiness"
top_pad="-36"
- width="85">
+ width="90">
Bumpiness
</text>
<combo_box
@@ -2453,7 +2451,7 @@ even though the user gets a free copy.
left_delta="0"
name="combobox bumpiness"
top_pad="4"
- width="85">
+ width="90">
<combo_box.item
label="None"
name="None"
@@ -2569,7 +2567,7 @@ even though the user gets a free copy.
layout="topleft"
left="10"
name="tex scale"
- top_pad="5"
+ top_pad="4"
width="200">
Repeats / Face
</text>
@@ -2603,7 +2601,6 @@ even though the user gets a free copy.
left="20"
max_val="100"
name="TexScaleV"
- top_pad="0"
width="160" />
<check_box
height="19"
@@ -2613,7 +2610,6 @@ even though the user gets a free copy.
name="checkbox flip t"
top_delta="0"
width="70" />
-
<spinner
decimal_digits="2"
follows="left|top"
@@ -2627,13 +2623,12 @@ even though the user gets a free copy.
max_val="9999"
min_val="-9999"
name="TexRot"
- top_delta="25"
width="170" />
<spinner
decimal_digits="1"
follows="left|top"
- height="19"
+ height="23"
initial_value="1"
label="Repeats / Meter"
layout="topleft"
@@ -2642,7 +2637,6 @@ even though the user gets a free copy.
max_val="10"
min_val="0.1"
name="rptctrl"
- top_delta="20"
width="170" />
<button
follows="left|top"
@@ -2661,7 +2655,6 @@ even though the user gets a free copy.
layout="topleft"
left="10"
name="tex offset"
- top_delta="20"
width="200">
Texture Offset
</text>
@@ -2675,7 +2668,6 @@ even though the user gets a free copy.
left="20"
min_val="-1"
name="TexOffsetU"
- top_pad="6"
width="160" />
<spinner
follows="left|top"
@@ -2698,30 +2690,20 @@ even though the user gets a free copy.
bg_alpha_color="DkGray"
name="Add_Media"
left="0"
- top_pad="0"
- height="75"
- width="278">
+ height="63"
+ width="290">
<text
type="string"
length="1"
follows="left|top"
- height="12"
+ height="18"
layout="topleft"
left="10"
- top_pad="5"
+ top_pad="3"
name="media_tex"
- width="260">
+ width="190">
Media
</text>
- <text
- follows="left|top|right"
- height="18"
- layout="topleft"
- left="10"
- use_ellipses="true"
- read_only="true"
- name="media_info"
- width="180" />
<button
follows="top|left"
height="18"
@@ -2767,6 +2749,15 @@ even though the user gets a free copy.
<button.commit_callback
function="BuildTool.EditMedia"/>
</button>
+ <text
+ follows="left|top|right"
+ height="9"
+ layout="topleft"
+ left="10"
+ use_ellipses="true"
+ read_only="true"
+ name="media_info"
+ width="280" />
<web_browser
visible="false"
enabled="false"
@@ -2780,16 +2771,15 @@ even though the user gets a free copy.
start_url="about:blank"
decouple_texture_size="true" />
<button
- follows="left|top"
- height="23"
+ follows="right|top"
+ height="22"
label="Align"
label_selected="Align Media"
layout="topleft"
- left="10"
+ right="-10"
name="button align"
- top_pad="5"
tool_tip="Align media texture (must load first)"
- width="100" />
+ width="80" />
</panel>
</panel>
<panel
@@ -2802,36 +2792,36 @@ even though the user gets a free copy.
help_topic="toolbox_contents_tab"
name="Contents"
top_delta="0"
- width="280">
+ width="295">
<button
follows="left|top"
- height="19"
+ height="23"
label="New Script"
label_selected="New Script"
layout="topleft"
left="10"
name="button new script"
top="10"
- width="120" />
+ width="134" />
<button
follows="left|top"
- height="19"
+ height="23"
label="Permissions"
layout="topleft"
left_pad="8"
name="button permissions"
- width="130" />
+ width="134" />
<panel_inventory_object
border="true"
border_visible="true"
bevel_style="in"
- follows="left|top"
+ follows="left|top|right"
height="325"
layout="topleft"
left="10"
name="contents_inventory"
top="50"
- width="260" />
+ width="275" />
</panel>
</tab_container>
<panel
@@ -2841,7 +2831,7 @@ even though the user gets a free copy.
left_delta="0"
name="land info panel"
top_delta="0"
- width="280">
+ width="295">
<text
type="string"
length="1"
@@ -2881,7 +2871,7 @@ even though the user gets a free copy.
</text>
<button
follows="left|top"
- height="20"
+ height="23"
label="About Land"
label_selected="About Land"
layout="topleft"
@@ -2914,7 +2904,7 @@ even though the user gets a free copy.
</text>
<button
follows="left|top"
- height="20"
+ height="23"
label="Subdivide"
label_selected="Subdivide"
layout="topleft"
@@ -2924,7 +2914,7 @@ even though the user gets a free copy.
width="112" />
<button
follows="left|top"
- height="20"
+ height="23"
label="Join"
label_selected="Join"
layout="topleft"
@@ -2947,7 +2937,7 @@ even though the user gets a free copy.
</text>
<button
follows="left|top"
- height="20"
+ height="23"
label="Buy Land"
label_selected="Buy Land"
layout="topleft"
@@ -2957,7 +2947,7 @@ even though the user gets a free copy.
width="112" />
<button
follows="left|top"
- height="20"
+ height="23"
label="Abandon Land"
label_selected="Abandon Land"
layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_tos.xml b/indra/newview/skins/default/xui/en/floater_tos.xml
index 5e168fe4aa..f3665e87ed 100644
--- a/indra/newview/skins/default/xui/en/floater_tos.xml
+++ b/indra/newview/skins/default/xui/en/floater_tos.xml
@@ -33,7 +33,7 @@
<check_box
follows="top|right"
height="16"
- label="I Agree to the Terms of Service"
+ label="I Agree to the Terms of Service and Privacy Policy"
layout="topleft"
left_delta="0"
name="agree_chk"
@@ -51,7 +51,7 @@
top_delta="-399"
word_wrap="true"
width="552">
- Please read the following Terms of Service carefully. To continue logging in to [SECOND_LIFE], you must accept the agreement.
+ Please read the following Terms of Service and Privacy Policy carefully. To continue logging in to [SECOND_LIFE], you must accept the agreement.
</text>
<web_browser
follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index 85853f39bb..e8f9d65be5 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -143,12 +143,19 @@
<panel mouse_opaque="false"
follows="left|right|top"
name="status_bar_container"
- tab_stop="false"
+ tab_stop="false"
height="19"
left="0"
top="0"
width="1024"
visible="false"/>
+ <view mouse_opaque="false"
+ follows="all"
+ name="menu_bar_holder"
+ left="0"
+ top="0"
+ width="1024"
+ height="768"/>
<notify_box_view top="0"
follows="all"
height="768"
@@ -159,6 +166,33 @@
<panel top="0"
follows="all"
height="768"
+ mouse_opaque="true"
+ name="progress_view"
+ filename="panel_progress.xml"
+ class="progress_view"
+ width="1024"
+ visible="false"/>
+ <panel top="0"
+ follows="all"
+ mouse_opaque="false"
+ left="0"
+ name="snapshot_floater_view_holder"
+ width="1024"
+ height="798">
+ <snapshot_floater_view enabled="false"
+ follows="all"
+ height="768"
+ left="0"
+ mouse_opaque="false"
+ name="Snapshot Floater View"
+ tab_stop="false"
+ top="0"
+ visible="false"
+ width="1024"/>
+ </panel>
+ <panel top="0"
+ follows="all"
+ height="768"
mouse_opaque="false"
name="popup_holder"
class="popup_holder"
@@ -169,16 +203,6 @@
mouse_opaque="false"
name="Menu Holder"
width="1024"/>
- <snapshot_floater_view enabled="false"
- follows="all"
- height="768"
- left="0"
- mouse_opaque="false"
- name="Snapshot Floater View"
- tab_stop="false"
- top="0"
- visible="false"
- width="1024"/>
<tooltip_view top="0"
follows="all"
height="768"
diff --git a/indra/newview/skins/default/xui/en/menu_profile_overflow.xml b/indra/newview/skins/default/xui/en/menu_profile_overflow.xml
index 5162a4902f..b0b7b554b0 100644
--- a/indra/newview/skins/default/xui/en/menu_profile_overflow.xml
+++ b/indra/newview/skins/default/xui/en/menu_profile_overflow.xml
@@ -6,6 +6,15 @@
name="profile_overflow_menu"
width="120">
<menu_item_call
+ label="Map"
+ layout="topleft"
+ name="show_on_map">
+ <menu_item_call.on_click
+ function="Profile.ShowOnMap" />
+ <menu_item_call.on_enable
+ function="Profile.EnableShowOnMap" />
+ </menu_item_call>
+ <menu_item_call
label="Pay"
layout="topleft"
name="pay">
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 5c75a95c16..8289ef3953 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -177,7 +177,8 @@
label="Nearby Chat"
layout="topleft"
name="Nearby Chat"
- shortcut="control|H">
+ shortcut="control|H"
+ use_mac_ctrl="true">
<menu_item_check.on_check
function="Floater.Visible"
parameter="nearby_chat" />
diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
index 1e2e74f882..876ff9961b 100644
--- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
@@ -69,7 +69,7 @@
name="last_interaction"
text_color="LtGray_50"
value="0s"
- width="24" />
+ width="35" />
<button
follows="right"
height="16"
diff --git a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
index 072ea882e6..d3f6695375 100644
--- a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
@@ -39,7 +39,13 @@
name="blocked"
tool_tip="List of currently blocked Residents"
top="30"
- width="270" />
+ width="270">
+ <scroll_list.columns
+ name="item_name" />
+ <scroll_list.columns
+ name="item_type"
+ width="96" />
+ </scroll_list>
<button
follows="left|bottom"
height="23"
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 015a2e91ff..58c5c11e51 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -59,9 +59,9 @@
height="28"
layout="topleft"
min_height="28"
- width="100"
+ width="105"
top_delta="0"
- min_width="100"
+ min_width="54"
name="speak_panel"
user_resize="false">
<talk_button
@@ -73,11 +73,16 @@
left="0"
name="talk"
top="5"
- width="100">
+ width="105">
+ <!-- do not remove halign attribute with default value. otherwise it can't be overridden in other locales.
+ & pad_right is default value for long label which can be right aligned. See EXT-6318 -->
<speak_button
+ halign="center"
name="speak_btn"
label="Speak"
label_selected="Speak"
+ pad_right="22"
+ use_ellipses="true"
/>
<show_button>
<show_button.init_callback
diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
index 7445bb339d..08ee0306dd 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
@@ -12,6 +12,10 @@
help_topic="profile_edit_pick"
top="0"
width="333">
+ <panel.string
+ name="location_notice">
+ (will update after save)
+ </panel.string>
<button
follows="top|right"
height="23"
@@ -179,7 +183,7 @@
<button
follows="bottom|left"
height="23"
- label="Save [WHAT]"
+ label="Save Pick"
layout="topleft"
name="save_changes_btn"
left="0"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
index 26be8440e7..dff2b9a214 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -146,7 +146,7 @@
layout="topleft"
left="123"
top="25"
- max_length="512"
+ max_length="511"
name="sl_description_edit"
width="157"
word_wrap="true">
@@ -200,7 +200,7 @@
height="102"
layout="topleft"
left="123"
- max_length="512"
+ max_length="254"
top="157"
name="fl_description_edit"
width="157"
diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
index 19c0da4f08..0eb5c47f85 100644
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -385,7 +385,7 @@ things in this group. There&apos;s a broad variety of Abilities.
left="0"
follows="left|top|right"
right="-1"
- max_length="295"
+ max_length="20"
name="role_name"
top_pad="0"
width="300">
@@ -408,7 +408,7 @@ things in this group. There&apos;s a broad variety of Abilities.
left="0"
follows="left|top|right"
right="-1"
- max_length="295"
+ max_length="20"
name="role_title"
top_pad="0"
width="300">
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 627e616af5..cc68ec2bdc 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -204,7 +204,7 @@ height="16"
name="forgot_password_text"
top_pad="12"
right="-10"
- width="180">
+ width="210">
Forgot your name or password?
</text>
<text
@@ -216,7 +216,7 @@ height="16"
name="login_help"
top_pad="2"
right="-10"
- width="180">
+ width="190">
Need help logging in? </text>
<!-- <text
follows="right|bottom"
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 65da20ae8c..43cf0607b5 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -10,9 +10,34 @@
name="main inventory panel"
width="330">
<panel.string
- name="Title">
- Things
+ name="Itemcount">
</panel.string>
+ <panel.string
+ name="ItemcountFetching">
+ Fetching [ITEM_COUNT] Items... [FILTER]
+ </panel.string>
+ <panel.string
+ name="ItemcountCompleted">
+ [ITEM_COUNT] Items [FILTER]
+ </panel.string>
+ <panel.string
+ name="ItemcountUnknown">
+
+ </panel.string>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="13"
+ layout="topleft"
+ left="12"
+ name="ItemcountText"
+ font="SansSerifMedium"
+ text_color="EmphasisColor"
+ top_pad="0"
+ width="300">
+ Items:
+ </text>
<menu_bar
bg_visible="false"
follows="left|top|right"
@@ -21,8 +46,8 @@
left="10"
mouse_opaque="false"
name="Inventory Menu"
- top="0"
- visible="true"
+ top="+10"
+ visible="true"
width="290">
<menu
height="101"
@@ -387,30 +412,30 @@
<filter_editor
text_pad_left="10"
follows="left|top|right"
- height="23"
+ height="23"
label="Filter Inventory"
layout="topleft"
left="10"
-max_length="300"
+ max_length="300"
name="inventory search editor"
- top="26"
+ top="+31"
width="303" />
<tab_container
- bg_opaque_color="DkGray2"
+ bg_opaque_color="DkGray2"
bg_alpha_color="DkGray2"
background_visible="true"
background_opaque="true"
-follows="all"
-halign="center"
- height="305"
- layout="topleft"
- left="6"
- name="inventory filter tabs"
- tab_height="30"
- tab_position="top"
- tab_min_width="100"
- top_pad="10"
- width="315">
+ follows="all"
+ halign="center"
+ height="300"
+ layout="topleft"
+ left="6"
+ name="inventory filter tabs"
+ tab_height="30"
+ tab_position="top"
+ tab_min_width="100"
+ top_pad="10"
+ width="315">
<inventory_panel
bg_opaque_color="DkGray2"
bg_alpha_color="DkGray2"
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_media.xml b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
index 7c0ce9e62e..d14712a7fa 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
@@ -95,6 +95,7 @@
follows="top|left"
font="SansSerif"
left="10"
+ name="nearby_media"
width="100">
Nearby Media
</text>
@@ -105,6 +106,7 @@
font="SansSerif"
top_pad="15"
left="10"
+ name="show"
width="40">
Show:
</text>
@@ -130,7 +132,7 @@
<combo_box.item
label="On other Avatars"
value="4"
- ame="OnOthers" />
+ name="OnOthers" />
</combo_box>
<scroll_list
name="media_list"
@@ -179,6 +181,7 @@
top_pad="5"
height="30"
left="10"
+ name="media_controls_panel"
right="-10">
<layout_stack
name="media_controls"
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 4be4d6b432..e604e401f6 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -13,6 +13,10 @@
name="aspect_ratio_text">
[NUM]:[DEN]
</panel.string>
+ <panel.string
+ name="middle_mouse">
+ Middle Mouse
+ </panel.string>
<icon
follows="left|top"
height="18"
@@ -160,7 +164,7 @@ Automatic position for:
label="Opacity"
layout="topleft"
left="80"
- label_width="50"
+ label_width="60"
name="bubble_chat_opacity"
width="200" />
<color_swatch
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
index 188fd3b7bc..516457dd93 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
@@ -51,13 +51,13 @@
Always show:
</text>
<scroll_list
- follows="top|left"
+ follows="top|left|right"
height="140"
layout="topleft"
left="10"
multi_select="true"
name="enabled_popups"
- width="475" />
+ width="495" />
<button
enabled_control="FirstSelectedDisabledPopups"
follows="top|left"
@@ -99,11 +99,11 @@
Never show:
</text>
<scroll_list
- follows="top|left"
+ follows="top|left|right"
height="140"
layout="topleft"
left="10"
multi_select="true"
name="disabled_popups"
- width="475" />
+ width="495" />
</panel>
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 3d434361b9..eb2112c586 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -337,6 +337,7 @@
top_pad="5"
width="400" />
<text
+ name="show_ims_in_label"
follows="left|top"
layout="topleft"
left="30"
@@ -346,6 +347,7 @@
Show IMs in:
</text>
<text
+ name="requires_restart_label"
follows="left|top"
layout="topleft"
top_delta="0"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index d11aebe943..e667fa9a2b 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -365,12 +365,12 @@
use_ellipses="false"
hover="false"
commit_on_focus_lost = "true"
- follows="left|top"
+ follows="left|top|right"
height="60"
layout="topleft"
left="50"
name="busy_response"
- width="440"
+ width="450"
word_wrap="true">
log_in_to_change
</text_editor>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index c74de043e9..66eae5f516 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -182,12 +182,12 @@
visiblity_control="ShowAdvancedGraphicsSettings"
border="false"
follows="top|left"
- height="260"
+ height="283"
label="CustomGraphics"
layout="topleft"
left="5"
name="CustomGraphics Panel"
- top="124"
+ top="101"
width="485">
<text
type="string"
@@ -238,119 +238,111 @@
<check_box.commit_callback
function="Pref.VertexShaderEnable" />
</check_box>
- <check_box
- control_name="RenderWaterReflections"
+ <check_box
+ control_name="RenderDeferred"
height="16"
initial_value="true"
- label="Water reflections"
+ label="Lighting and Shadows"
layout="topleft"
left_delta="0"
- name="Reflections"
+ name="UseLightShaders"
top_pad="1"
width="256">
- <check_box.commit_callback
+ <check_box.commit_callback
function="Pref.VertexShaderEnable" />
- </check_box>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="12"
- layout="topleft"
- left_delta="0"
- name="ReflectionDetailText"
- top_pad="7"
- width="128">
- Reflection detail:
- </text>
- <radio_group
- control_name="RenderReflectionDetail"
- draw_border="false"
- height="70"
- layout="topleft"
- left_delta="-2"
- name="ReflectionDetailRadio"
- top_pad="3"
- width="321">
- <radio_item
- height="16"
- label="Terrain and trees"
- layout="topleft"
- left="3"
- name="0"
- top="3"
- width="315" />
- <radio_item
- height="16"
- label="All static objects"
- layout="topleft"
- left_delta="0"
- name="1"
- top_delta="16"
- width="315" />
- <radio_item
- height="16"
- label="All avatars and objects"
- layout="topleft"
- left_delta="0"
- name="2"
- top_delta="16"
- width="315" />
- <radio_item
- height="16"
- label="Everything"
- layout="topleft"
- left_delta="0"
- name="3"
- top_delta="16"
- width="315" />
- </radio_group>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="12"
- layout="topleft"
- left_delta="2"
- name="AvatarRenderingText"
- top_pad="5"
- width="128">
- Avatar rendering:
- </text>
- <check_box
- control_name="RenderUseImpostors"
- height="16"
- initial_value="true"
- label="Avatar impostors"
- layout="topleft"
- left_delta="0"
- name="AvatarImpostors"
- top_pad="7"
- width="256" />
- <check_box
- control_name="RenderAvatarVP"
+ </check_box>
+ <check_box
+ control_name="RenderDeferredSSAO"
height="16"
initial_value="true"
- label="Hardware skinning"
+ label="Ambient Occlusion"
layout="topleft"
left_delta="0"
- name="AvatarVertexProgram"
+ name="UseSSAO"
top_pad="1"
width="256">
- <check_box.commit_callback
+ <check_box.commit_callback
function="Pref.VertexShaderEnable" />
- </check_box>
- <check_box
- control_name="RenderAvatarCloth"
- height="16"
- initial_value="true"
- label="Avatar cloth"
- layout="topleft"
- left_delta="0"
- name="AvatarCloth"
- top_pad="1"
- width="256" />
+ </check_box>
+ <text
+ type="string"
+ length="1"
+ top_pad="8"
+ follows="top|left"
+ height="23"
+ width="110"
+ word_wrap="true"
+ layout="topleft"
+ left="10"
+ name="shadows_label">
+ Shadows:
+ </text>
+ <combo_box
+ control_name="RenderShadowDetail"
+ height="23"
+ layout="topleft"
+ left="10"
+ top_pad="0"
+ name="ShadowDetail"
+ width="150">
+ <combo_box.item
+ label="None"
+ name="0"
+ value="0"/>
+ <combo_box.item
+ label="Sun/Moon"
+ name="1"
+ value="1"/>
+ <combo_box.item
+ label="Sun/Moon + Projectors"
+ name="2"
+ value="2"/>
+ </combo_box>
+
+ <text
+ type="string"
+ length="1"
+ top_pad="8"
+ follows="top|left"
+ height="23"
+ width="110"
+ word_wrap="true"
+ layout="topleft"
+ left="10"
+ name="reflection_label">
+ Water Reflections:
+ </text>
+ <combo_box
+ control_name="RenderReflectionDetail"
+ height="23"
+ layout="topleft"
+ left_="10"
+ top_pad ="0"
+ name="Reflections"
+ width="150">
+ <combo_box.item
+ label="Minimal"
+ name="0"
+ value="0"/>
+ <combo_box.item
+ label="Terrain and trees"
+ name="1"
+ value="1"/>
+ <combo_box.item
+ label="All static objects"
+ name="2"
+ value="2"/>
+ <combo_box.item
+ label="All avatars and objects"
+ name="3"
+ value="3"/>
+ <combo_box.item
+ label="Everything"
+ name="4"
+ value="4"/>
+ </combo_box>
+
<slider
control_name="RenderFarClip"
decimal_digits="0"
@@ -549,7 +541,7 @@
layout="topleft"
left="444"
name="PostProcessText"
- top="305"
+ top="328"
width="128">
Low
</text>
@@ -626,46 +618,51 @@
width="128">
Low
</text>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="12"
- layout="topleft"
- left_delta="-230"
- name="LightingDetailText"
- top_pad="8"
- width="140">
- Lighting detail:
- </text>
- <radio_group
- control_name="RenderLightingDetail"
- draw_border="false"
- height="38"
- layout="topleft"
- left_delta="0"
- name="LightingDetailRadio"
- top_pad="5"
- width="321">
- <radio_item
- height="16"
- label="Sun and moon only"
- layout="topleft"
- left="3"
- name="SunMoon"
- value="0"
- top="3"
- width="156" />
- <radio_item
- height="16"
- label="Nearby local lights"
- layout="topleft"
- left_delta="0"
- name="LocalLights"
- value="1"
- top_delta="16"
- width="156" />
- </radio_group>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="12"
+ layout="topleft"
+ left_delta="-230"
+ name="AvatarRenderingText"
+ top_pad="8"
+ width="128">
+ Avatar rendering:
+ </text>
+ <check_box
+ control_name="RenderUseImpostors"
+ height="16"
+ initial_value="true"
+ label="Avatar impostors"
+ layout="topleft"
+ left_delta="0"
+ name="AvatarImpostors"
+ top_pad="7"
+ width="256" />
+ <check_box
+ control_name="RenderAvatarVP"
+ height="16"
+ initial_value="true"
+ label="Hardware skinning"
+ layout="topleft"
+ left_delta="0"
+ name="AvatarVertexProgram"
+ top_pad="1"
+ width="256">
+ <check_box.commit_callback
+ function="Pref.VertexShaderEnable" />
+ </check_box>
+ <check_box
+ control_name="RenderAvatarCloth"
+ height="16"
+ initial_value="true"
+ label="Avatar cloth"
+ layout="topleft"
+ left_delta="0"
+ name="AvatarCloth"
+ top_pad="1"
+ width="256" />
<text
type="string"
length="1"
@@ -674,7 +671,7 @@
layout="topleft"
left="358"
name="TerrainDetailText"
- top="465"
+ top="488"
width="155">
Terrain detail:
</text>
@@ -703,7 +700,7 @@
name="2"
top_delta="16"
width="315" />
- </radio_group>
+ </radio_group> -->
</panel>
<button
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
index f232a69482..3d7f392404 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -69,15 +69,6 @@
name="auto_disengage_mic_check"
top_pad="10"
width="350" />
- <check_box
- control_name="CookiesEnabled"
- height="16"
- label="Accept cookies"
- layout="topleft"
- left="30"
- name="cookies_enabled"
- top_pad="10"
- width="350" />
<text
type="string"
length="1"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index 8723e0a832..2123e62daa 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -142,14 +142,14 @@
increment="1"
initial_value="13000"
label="Port number:"
- label_width="75"
+ label_width="105"
layout="topleft"
left_delta="160"
max_val="13050"
min_val="13000"
name="connection_port"
- top_delta="-2"
- width="140" />
+ top_delta="3"
+ width="170" />
<text
type="string"
length="1"
@@ -265,35 +265,80 @@
layout="topleft"
left_delta="50"
name="use_external_browser"
- top_pad="4"
+ top_pad="-2"
width="480">
<radio_item
height="20"
- label="Use built-in browser"
- layout="topleft"
- left="0"
- name="internal"
- value="0"
- tool_tip="Use the built-in web browser for help, web links, etc. This browser opens as a new window inside [APP_NAME]."
- top="0"
- width="480" />
- <radio_item
- height="20"
label="Use my browser (IE, Firefox, Safari)"
layout="topleft"
left_delta="0"
name="external"
value="1"
+ top="0"
tool_tip="Use the default system web browser for help, web links, etc. Not recommended if running full screen."
+ width="480" />
+ <radio_item
+ height="20"
+ label="Use built-in browser"
+ layout="topleft"
+ left="0"
+ name="internal"
+ value=""
+ tool_tip="Use the built-in web browser for help, web links, etc. This browser opens as a new window inside [APP_NAME]."
top_delta="20"
width="480" />
</radio_group>
<check_box
+ top_delta="2"
+ enabled="true"
+ follows="left|top"
+ height="18"
+ initial_value="true"
+ control_name="BrowserPluginsEnabled"
+ label="Enable plugins"
+ left_delta="20"
+ mouse_opaque="true"
+ name="browser_plugins_enabled"
+ radio_style="false"
+ width="400"
+ top_pad="5"/>
+
+ <check_box
+ top_delta="4"
+ enabled="true"
+ follows="left|top"
+ height="14"
+ initial_value="true"
+ control_name="CookiesEnabled"
+ label="Accept cookies"
+ left_delta="0"
+ mouse_opaque="true"
+ name="cookies_enabled"
+ radio_style="false"
+ width="400"
+ top_pad="5"/>
+
+ <check_box
top_delta="4"
enabled="true"
follows="left|top"
- height="16"
+ height="14"
+ initial_value="true"
+ control_name="BrowserJavascriptEnabled"
+ label="Enable Javascript"
+ left_delta="0"
+ mouse_opaque="true"
+ name="browser_javascript_enabled"
+ radio_style="false"
+ width="400"
+ top_pad="5"/>
+
+ <check_box
+ top_delta="4"
+ enabled="true"
+ follows="left|top"
+ height="14"
initial_value="false"
control_name="BrowserProxyEnabled"
label="Enable Web Proxy"
@@ -308,9 +353,9 @@
follows="left|top"
height="10"
layout="topleft"
- left_delta="1"
+ left_delta="20"
name="Proxy location"
- top_delta="20"
+ top_delta="16"
width="300">
Proxy location:
</text>
@@ -335,9 +380,9 @@
increment="1"
initial_value="80"
label="Port number:"
- label_width="75"
+ label_width="95"
layout="topleft"
- left_delta="230"
+ left_delta="210"
max_val="12000"
min_val="10"
name="web_proxy_port"
diff --git a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
index 6b5f0c3896..6bf00373ea 100644
--- a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
follows="left|right|top|bottom"
- name="MediaControlsPanel"
+ name="MediaControls"
background_visible="false"
height="200"
layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 412485e03f..30191aecb6 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -314,9 +314,12 @@
left="2"
mouse_opaque="false"
name="add_friend"
+ pad_left="1"
+ pad_right="1"
tool_tip="Offer friendship to the Resident"
top="5"
- width="80" />
+ use_ellipses="true"
+ width="117" />
<button
follows="bottom|left"
height="23"
@@ -325,8 +328,8 @@
name="im"
tool_tip="Open instant message session"
top="5"
- left_pad="3"
- width="39" />
+ left_pad="1"
+ width="21" />
<button
follows="bottom|left"
height="23"
@@ -334,20 +337,12 @@
layout="topleft"
name="call"
tool_tip="Call this Resident"
- left_pad="3"
+ left_pad="1"
+ pad_left="1"
+ pad_right="1"
top="5"
- width="43" />
- <button
- enabled="false"
- follows="bottom|left"
- height="23"
- label="Map"
- layout="topleft"
- name="show_on_map_btn"
- tool_tip="Show the Resident on the map"
- top="5"
- left_pad="3"
- width="41" />
+ use_ellipses="true"
+ width="51" />
<button
follows="bottom|left"
height="23"
@@ -355,9 +350,12 @@
layout="topleft"
name="teleport"
tool_tip="Offer teleport"
- left_pad="3"
+ left_pad="1"
+ pad_left="1"
+ pad_right="1"
top="5"
- width="69" />
+ use_ellipses="true"
+ width="92" />
<button
follows="bottom|right"
height="23"
@@ -367,7 +365,6 @@
tool_tip="Pay money to or share inventory with the Resident"
right="-1"
top="5"
- left_pad="3"
width="23" />
</layout_panel>
<layout_panel
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index 0c870e155b..8c7de22cf8 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -94,12 +94,12 @@
<button
follows="right|top"
height="16"
- image_selected="Pause_Off"
- image_unselected="Play_Off"
- image_pressed="Play_Press"
- image_pressed_selected="Pause_Press"
+ image_selected="Play_Off"
+ image_unselected="Pause_Off"
+ image_pressed="Pause_Press"
+ image_pressed_selected="Play_Press"
is_toggle="true"
- left_pad="15"
+ left_pad="20"
top="1"
name="media_toggle_btn"
tool_tip="Start/Stop All Media (Music, Video, Web pages)"
@@ -112,12 +112,12 @@
image_pressed="Audio_Press"
image_unselected="Audio_Off"
is_toggle="true"
- left_pad="5"
+ left_pad="10"
top="2"
name="volume_btn"
tool_tip="Global Volume Control"
width="16" />
- <text
+ <!-- <text
follows="right|top"
halign="center"
height="12"
@@ -125,5 +125,5 @@
left_delta="0"
name="stat_btn"
top_delta="0"
- width="20"/>
+ width="20"/>-->
</panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index 12c06504ca..e5382e1e3f 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -399,6 +399,7 @@ top_pad="10"
top_pad="10"/>
</panel>
<panel
+ follows="bottom|left"
height="30"
layout="topleft"
name="button_panel"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index d93bbac106..882028c899 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -14,7 +14,14 @@
<!-- starting up -->
<string name="StartupDetectingHardware">Detecting hardware...</string>
- <string name="StartupLoading">Loading</string>
+ <string name="StartupLoading">Loading [APP_NAME]...</string>
+ <string name="StartupClearingCache">Clearing cache...</string>
+ <string name="StartupInitializingTextureCache">Initializing Texture Cache...</string>
+ <string name="StartupInitializingVFS">Initializing VFS...</string>
+
+ <!-- progress -->
+ <string name="ProgressRestoring">Restoring...</string>
+ <string name="ProgressChangingResolution">Changing Resolution...</string>
<!-- Legacy strings, almost never used -->
<string name="Fullbright">Fullbright (Legacy)</string> <!-- used in the Build > materials dropdown-->
@@ -40,12 +47,18 @@
<string name="LoginConnectingToRegion">Connecting to region...</string>
<string name="LoginDownloadingClothing">Downloading clothing...</string>
<string name="LoginFailedNoNetwork">Network Error: Could not establish connection, please check your network connection.</string>
+ <string name="LoginFailed">Login failed.</string>
<string name="Quit">Quit</string>
<string name="create_account_url">http://join.secondlife.com/</string>
<!-- Disconnection -->
<string name="AgentLostConnection">This region may be experiencing trouble. Please check your connection to the Internet.</string>
-
+ <string name="SavingSettings">Saving your settings...</string>
+ <string name="LoggingOut">Logging out...</string>
+ <string name="ShuttingDown">Shutting down...</string>
+ <string name="YouHaveBeenDisconnected">You have been disconnected from the region you were in.</string>
+ <string name="SentToInvalidRegion">You were sent to an invalid region.</string>
+ <string name="TestingDisconnect">Testing viewer disconnect</string>
<!-- Tooltip, lltooltipview.cpp -->
<string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar -->
@@ -68,6 +81,12 @@
<string name="TooltipHttpUrl">Click to view this web page</string>
<string name="TooltipSLURL">Click to view this location's information</string>
<string name="TooltipAgentUrl">Click to view this Resident's profile</string>
+ <string name="TooltipAgentMute">Click to mute this Resident</string>
+ <string name="TooltipAgentUnmute">Click to unmute this Resident</string>
+ <string name="TooltipAgentIM">Click to IM this Resident</string>
+ <string name="TooltipAgentPay">Click to Pay this Resident</string>
+ <string name="TooltipAgentOfferTeleport">Click to offer a teleport request to this Resident</string>
+ <string name="TooltipAgentRequestFriend">Click to send a friend request to this Resident</string>
<string name="TooltipGroupUrl">Click to view this group's description</string>
<string name="TooltipEventUrl">Click to view this event's description</string>
<string name="TooltipClassifiedUrl">Click to view this classified</string>
@@ -84,6 +103,14 @@
<string name="SLurlLabelTeleport">Teleport to</string>
<string name="SLurlLabelShowOnMap">Show Map for</string>
+ <!-- label strings for secondlife:///app/agent SLapps -->
+ <string name="SLappAgentMute">Mute</string>
+ <string name="SLappAgentUnmute">Unmute</string>
+ <string name="SLappAgentIM">IM</string>
+ <string name="SLappAgentPay">Pay</string>
+ <string name="SLappAgentOfferTeleport">Offer Teleport to </string>
+ <string name="SLappAgentRequestFriend">Friend Request </string>
+
<!-- ButtonToolTips, llfloater.cpp -->
<string name="BUTTON_CLOSE_DARWIN">Close (&#8984;W)</string>
<string name="BUTTON_CLOSE_WIN">Close (Ctrl+W)</string>
@@ -134,6 +161,7 @@
<string name="AssetErrorUnknownStatus">Unknown status</string>
<!-- Asset Type human readable names: these will replace variable [TYPE] in notification FailedToFindWearable* -->
+ <!-- Will also replace [OBJECTTYPE] in notifications: UserGiveItem, ObjectGiveItem -->
<string name="texture">texture</string>
<string name="sound">sound</string>
<string name="calling card">calling card</string>
@@ -158,6 +186,7 @@
<string name="simstate">simstate</string>
<string name="favorite">favorite</string>
<string name="symbolic link">link</string>
+ <string name="symbolic folder link">folder link</string>
<!-- llvoavatar. Displayed in the avatar chat bubble -->
<string name="AvatarEditingAppearance">(Editing Appearance)</string>
@@ -1823,6 +1852,7 @@ Clears (deletes) the media and all params from the given face.
<string name="LoadingContents">Loading contents...</string>
<string name="NoContents">No contents</string>
<string name="WornOnAttachmentPoint" value=" (worn on [ATTACHMENT_POINT])" />
+ <string name="ActiveGesture" value="[GESLABEL] (active)"/>
<!-- Inventory permissions -->
<string name="PermYes">Yes</string>
<string name="PermNo">No</string>
@@ -1879,6 +1909,7 @@ Clears (deletes) the media and all params from the given face.
<string name="InvFolder favorite">Favorites</string>
<string name="InvFolder Current Outfit">Current Outfit</string>
<string name="InvFolder My Outfits">My Outfits</string>
+ <string name="InvFolder Accessories">Accessories</string>
<string name="InvFolder Meshes">Meshes</string>
<!-- are used for Friends and Friends/All folders in Inventory "Calling cards" folder. See EXT-694-->
@@ -2109,6 +2140,7 @@ Clears (deletes) the media and all params from the given face.
<!-- panel contents -->
<string name="PanelContentsNewScript">New Script</string>
+ <string name="PanelContentsTooltip">Content of object</string>
<!-- panel preferences general -->
<string name="BusyModeResponseDefault">The Resident you messaged is in &apos;busy mode&apos; which means they have requested not to be disturbed. Your message will still be shown in their IM panel for later viewing.</string>
@@ -2171,7 +2203,8 @@ Clears (deletes) the media and all params from the given face.
<!-- Viewer menu -->
<string name="AcquiredItems">Acquired Items</string>
<string name="Cancel">Cancel</string>
- <string name="UploadingCosts">Uploading %s costs</string>
+ <string name="UploadingCosts">Uploading [NAME] costs L$ [AMOUNT]</string>
+ <string name="BuyingCosts">Buying this costs L$ [AMOUNT]</string>
<string name="UnknownFileExtension">
Unknown file extension .%s
Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
@@ -3016,4 +3049,51 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="unread_chat_multiple">
[SOURCES] have said something new
</string>"
+
+ <!-- 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_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>
+ <string name="for a land access pass">for a land access pass</string>
+ <string name="for deeding land">for deeding land</string>
+ <string name="to create a group">to create a group</string>
+ <string name="to join a group">to join a group</string>
+ <string name="to upload">to upload</string>
+
+ <string name="giving">Giving L$ [AMOUNT]</string>
+ <string name="uploading_costs">Uploading costs L$ [AMOUNT]</string>
+ <string name="this_costs">This costs L$ [AMOUNT]</string>
+ <string name="buying_selected_land">Buying selected land for L$ [AMOUNT]</string>
+ <string name="this_object_costs">This object costs L$ [AMOUNT]</string>
+
+ <string name="group_role_everyone">Everyone</string>
+ <string name="group_role_officers">Officers</string>
+ <string name="group_role_owners">Owners</string>
+
+ <string name="uploading_abuse_report">Uploading...
+
+Abuse Report</string>
+
+ <!-- names for new inventory items-->
+ <string name="New Shape">New Shape</string>
+ <string name="New Skin">New Skin</string>
+ <string name="New Hair">New Hair</string>
+ <string name="New Eyes">New Eyes</string>
+ <string name="New Shirt">New Shirt</string>
+ <string name="New Pants">New Pants</string>
+ <string name="New Shoes">New Shoes</string>
+ <string name="New Socks">New Socks</string>
+ <string name="New Jacket">New Jacket</string>
+ <string name="New Gloves">New Gloves</string>
+ <string name="New Undershirt">New Undershirt</string>
+ <string name="New Underpants">New Underpants</string>
+ <string name="New Skirt">New Skirt</string>
+ <string name="New Alpha">New Alpha</string>
+ <string name="New Tattoo">New Tattoo</string>
+ <string name="Invalid Wearable">Invalid Wearable</string>
+ <string name="New Script">New Script</string>
+ <string name="New Folder">New Folder</string>
+ <string name="Contents">Contents</string>
</strings>
diff --git a/indra/newview/skins/default/xui/en/widgets/chat_history.xml b/indra/newview/skins/default/xui/en/widgets/chat_history.xml
index ef885e8045..aa3ea736b8 100644
--- a/indra/newview/skins/default/xui/en/widgets/chat_history.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chat_history.xml
@@ -2,6 +2,7 @@
<chat_history
message_header="panel_chat_header.xml"
message_separator="panel_chat_separator.xml"
+ message_plaintext_separator="panel_chat_plaintext_separator.xml"
left_text_pad="10"
right_text_pad="15"
left_widget_pad="0"