diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en')
38 files changed, 797 insertions, 557 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' 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_sell_land.xml b/indra/newview/skins/default/xui/en/floater_sell_land.xml index afc44c41b8..4cae42bcfe 100644 --- a/indra/newview/skins/default/xui/en/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/en/floater_sell_land.xml @@ -203,13 +203,13 @@ name="none" visible="false" /> <radio_item - bottom="20" + top_pad="10" height="16" label="No, keep ownership of objects" left="10" name="no" /> <radio_item - bottom="40" + top_pad="10" height="16" label="Yes, sell objects with land" left="10" diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml index 89712efbb7..7dcf2aab99 100644 --- a/indra/newview/skins/default/xui/en/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater legacy_header_height="18" - can_minimize="false" - can_close="true" + can_minimize="true" + can_close="false" follows="left|top" height="340" layout="topleft" @@ -23,7 +23,7 @@ </floater.string> <view height="160" - width="225" + width="230" layout="topleft" name="thumbnail_placeholder" top_pad="30" @@ -45,74 +45,74 @@ follows="left|top" height="20" layout="topleft" - left="15" + left="10" max_length="500" name="description" - top_pad="20" - width="225" + top_pad="15" + width="230" label="Description"/> <button - label="Share to Web" + label="Share Snapshot" name="share" - top_pad="15" - left="15" + top_pad="20" + left="10" width="130"/> <button label="Share to Web" name="share_to_web" top_delta="0" - left="15" + left="10" width="130"/> <button label="Save to My Inventory" name="save_to_inventory" top_delta="0" - left="15" + left="10" width="130"/> <button label="Save Snapshot" name="save" top_pad="7" - left="15" + left="10" width="130"/> <button label="Email Snapshot" name="share_to_email" top_delta="0" - left="15" + left="10" width="130"/> <button label="Save to My Computer" name="save_to_computer" top_delta="0" - left="15" + left="10" width="130"/> <button label="Set As Profile Pic" name="set_profile_pic" top_pad="7" - left="15" + left="10" width="130"/> <button label="Back" name="cancel" top_delta="0" - left="15" + left="10" width="130"/> <button - follows="right" - height="22" - layout="topleft" - right="-12" + follows="left" + height="22" + layout="topleft" + left="210" name="show_advanced" image_overlay="TabIcon_Close_Off" top_delta="1" width="30"/> <button - follows="right" + follows="left" height="22" layout="topleft" - right="-12" + left="210" visible="false" name="hide_advanced" image_overlay="TabIcon_Open_Off" @@ -121,7 +121,7 @@ <panel visible="false" left="250" - top="35" + top="17" name="snapshot_advanced" filename="panel_snapshot_advanced.xml"/> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 12d169b70a..fd046c3695 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" @@ -1553,7 +1552,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> @@ -1601,16 +1600,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" @@ -1882,7 +1881,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> @@ -1999,7 +1998,6 @@ even though the user gets a free copy. value="Cylinder" /> </combo_box> </panel> - <panel border="false" follows="all" @@ -2011,7 +2009,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" @@ -2249,7 +2247,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 @@ -2313,7 +2311,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> @@ -2344,7 +2342,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 @@ -2353,7 +2351,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" @@ -2372,7 +2370,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 @@ -2381,7 +2379,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" @@ -2408,7 +2406,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 @@ -2417,7 +2415,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" @@ -2533,7 +2531,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> @@ -2567,7 +2565,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" @@ -2577,7 +2574,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" @@ -2591,13 +2587,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" @@ -2606,7 +2601,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" @@ -2625,7 +2619,6 @@ even though the user gets a free copy. layout="topleft" left="10" name="tex offset" - top_delta="20" width="200"> Texture Offset </text> @@ -2639,7 +2632,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" @@ -2662,30 +2654,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" @@ -2731,6 +2713,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" @@ -2744,16 +2735,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 @@ -2766,36 +2756,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 @@ -2805,7 +2795,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" @@ -2845,7 +2835,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" @@ -2878,7 +2868,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" @@ -2888,7 +2878,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" @@ -2911,7 +2901,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" @@ -2921,7 +2911,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 158e764eae..a08bc16066 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 e70a0512d6..58c5c11e51 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -74,12 +74,15 @@ name="talk" top="5" 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="left" + halign="center" name="speak_btn" label="Speak" label_selected="Speak" - pad_left="12" + pad_right="22" + use_ellipses="true" /> <show_button> <show_button.init_callback 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_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml index f913c58cc9..9341d433e8 100644 --- a/indra/newview/skins/default/xui/en/panel_group_general.xml +++ b/indra/newview/skins/default/xui/en/panel_group_general.xml @@ -241,14 +241,17 @@ Hover your mouse over the options for more help. tool_tip="Sets whether your group contains information rated as Moderate" top_pad="4" width="190"> + <combo_item name="select_mature" value="Select"> + - Select Mature - + </combo_item> <combo_box.item - label="General Content" - name="pg" - value="Not Mature" /> - <combo_box.item label="Moderate Content" name="mature" value="Mature" /> + <combo_box.item + label="General Content" + name="pg" + value="Not Mature" /> </combo_box> <check_box follows="left|top" 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'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'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_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml index ee8bca6f83..639e5d30ef 100644 --- a/indra/newview/skins/default/xui/en/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml @@ -3,22 +3,25 @@ name="Landmarks" top="0" height="400" - layout="topleft" + layout="topleft" left="0" - width="380" + width="313" help_topic="panel_landmarks" border="false" background_visible="true" - bg_alpha_color="DkGray2" + bg_alpha_color="DkGray" follows="all"> <accordion + background_visible="true" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" follows="all" - height="360" + height="369" layout="topleft" - left="0" + left="3" name="landmarks_accordion" top="0" - width="380"> + width="307"> <accordion_tab layout="topleft" name="tab_favorites" @@ -33,7 +36,7 @@ mouse_opaque="true" name="favorites_list" start_folder="Favorites" - width="380"/> + width="307"/> </accordion_tab> <accordion_tab layout="topleft" @@ -49,7 +52,7 @@ mouse_opaque="true" name="landmarks_list" start_folder="Landmarks" - width="380"/> + width="307"/> </accordion_tab> <accordion_tab layout="topleft" @@ -65,7 +68,7 @@ mouse_opaque="true" name="my_inventory_list" start_folder="My Inventory" - width="380"/> + width="307"/> </accordion_tab> <accordion_tab layout="topleft" @@ -81,55 +84,64 @@ mouse_opaque="true" name="library_list" start_folder="LIBRARY" - width="380"/> + width="313"/> </accordion_tab> </accordion> <panel - bg_opaque_color="DkGray2" - bg_alpha_color="DkGray2" - background_visible="true" - background_opaque="true" + background_visible="true" bevel_style="none" bottom="0" follows="left|right|bottom" - height="38" + height="27" layout="bottomleft" - left="0" + left="3" name="bottom_panel" - width="380"> + width="313"> <button follows="bottom|left" tool_tip="Show additional options" - height="18" - image_disabled="OptionsMenu_Disabled" - image_selected="OptionsMenu_Press" - image_unselected="OptionsMenu_Off" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" layout="topleft" - left="10" + left="0" name="options_gear_btn" - top="14" - width="18" /> + top="1" + width="31" /> <button follows="bottom|left" - height="18" - image_selected="AddItem_Press" - image_unselected="AddItem_Off" - image_disabled="AddItem_Disabled" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="AddItem_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" layout="topleft" - left_pad="10" + left_pad="1" name="add_btn" tool_tip="Add new landmark" - width="18" /> + width="31" /> + <icon + follows="bottom|left" + height="25" + image_name="Toolbar_Middle_Off" + layout="topleft" + left_pad="1" + name="dummy_icon" + width="209" + /> <dnd_button - follows="bottom|right" - height="18" - image_selected="TrashItem_Press" - image_unselected="TrashItem_Off" + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Right_Over" + image_overlay="TrashItem_Off" + image_selected="Toolbar_Right_Selected" + image_unselected="Toolbar_Right_Off" layout="topleft" - right="-8" + left_pad="1" name="trash_btn" tool_tip="Remove selected landmark" - top="14" - width="18" /> + width="31" /> </panel> </panel> 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 50983d2976..bef62f48e0 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" @@ -377,30 +402,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="306" + layout="topleft" + left="7" + name="inventory filter tabs" + tab_height="30" + tab_position="top" + tab_min_width="100" + top_pad="10" + width="312"> <inventory_panel bg_opaque_color="DkGray2" bg_alpha_color="DkGray2" @@ -417,7 +442,7 @@ halign="center" name="All Items" sort_order_setting="InventorySortOrder" top="16" - width="290" /> + width="288" /> <inventory_panel bg_opaque_color="DkGray2" bg_alpha_color="DkGray2" @@ -426,7 +451,7 @@ halign="center" border="false" bevel_style="none" follows="all" - height="295" + height="293" label="RECENT" help_topic="recent_inventory_tab" layout="topleft" @@ -436,52 +461,61 @@ halign="center" </tab_container> <panel - bg_opaque_color="DkGray2" - bg_alpha_color="DkGray2" background_visible="true" - background_opaque="true" bevel_style="none" follows="left|right|bottom" - height="38" + height="27" layout="topleft" - top_pad="-1" - left="9" + top_pad="4" + left="10" name="bottom_panel" width="310"> <button follows="bottom|left" tool_tip="Show additional options" - height="18" - image_disabled="OptionsMenu_Disabled" - image_selected="OptionsMenu_Press" - image_unselected="OptionsMenu_Off" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" layout="topleft" - left="8" + left="0" name="options_gear_btn" - top="14" - width="18" /> + top="1" + width="31" /> <button follows="bottom|left" - height="18" - image_selected="AddItem_Press" - image_unselected="AddItem_Off" - image_disabled="AddItem_Disabled" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="AddItem_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" layout="topleft" - left_pad="10" + left_pad="1" name="add_btn" tool_tip="Add new item" - width="18" /> + width="31" /> + <icon + follows="bottom|left" + height="25" + image_name="Toolbar_Middle_Off" + layout="topleft" + left_pad="1" + name="dummy_icon" + width="209" + /> <dnd_button - follows="bottom|right" - height="18" - image_selected="TrashItem_Press" - image_unselected="TrashItem_Off" + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Right_Over" + image_overlay="TrashItem_Off" + image_selected="Toolbar_Right_Selected" + image_unselected="Toolbar_Right_Off" + left_pad="1" layout="topleft" - right="-7" name="trash_btn" tool_tip="Remove selected item" - top="14" - width="18" /> + width="31"/> </panel> 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 d14712a7fa..53dda1927a 100644 --- a/indra/newview/skins/default/xui/en/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml @@ -2,34 +2,34 @@ <panel can_resize="true" can_close="false" - mouse_opaque="true" - bg_opaque_image="Volume_Background" - bg_alpha_image="Volume_Background" - background_opaque="true" + bg_opaque_image="Volume_Background" + bg_alpha_image="Volume_Background" + background_opaque="true" background_visible="true" layout="topleft" width="270" - height="235" + height="230" name="nearby_media" help_topic="nearby_media"> + <string name="media_item_count_format">(%ld media items)</string> <string name="empty_item_text"><empty></string> <string name="parcel_media_name">Parcel Streaming Media</string> <string name="parcel_audio_name">Parcel Streaming Audio</string> <string name="playing_suffix">(playing)</string> <panel bevel_style="in" - background_visible="false" + background_visible="false" follows="left|right|top" top="0" - height="30" + height="35" name="minimized_controls" left="0"> <button name="all_nearby_media_disable_btn" follows="left" tool_tip="Turn all nearby media off" - left="15" - width="60" + left="8" + width="66" height="22" label="Stop All"> <button.commit_callback @@ -40,7 +40,7 @@ follows="left" tool_tip="Turn all nearby media on" left_pad="4" - width="60" + width="66" height="22" label="Start All"> <button.commit_callback @@ -68,8 +68,8 @@ follows="right" tool_tip="Advanced Controls" top_delta="0" - right="-10" - width="60" + right="-8" + width="66" height="22" toggle="true" label="More >>" @@ -95,7 +95,6 @@ follows="top|left" font="SansSerif" left="10" - name="nearby_media" width="100"> Nearby Media </text> @@ -106,7 +105,6 @@ font="SansSerif" top_pad="15" left="10" - name="show" width="40"> Show: </text> @@ -135,7 +133,6 @@ name="OnOthers" /> </combo_box> <scroll_list - name="media_list" follows="left|top|bottom|right" column_padding="0" height="105" @@ -144,7 +141,8 @@ bg_stripe_color="0.25 0.25 0.25 0.25" top_pad="8" left="10" - right="-10"> + right="-10" + name="media_list"> <scroll_list.columns type="checkbox" width="-1" @@ -181,7 +179,6 @@ top_pad="5" height="30" left="10" - name="media_controls_panel" right="-10"> <layout_stack name="media_controls" @@ -190,12 +187,14 @@ height="26" layout="topleft" top="4" - left="10" + left="8" right="-10" border_size="0" + mouse_opaque="false" orientation="horizontal"> <layout_panel name="stop" + mouse_opaque="false" auto_resize="false" user_resize="false" layout="topleft" @@ -223,6 +222,7 @@ </layout_panel> <layout_panel name="play" + mouse_opaque="false" auto_resize="false" user_resize="false" layout="topleft" @@ -250,6 +250,7 @@ </layout_panel> <layout_panel name="pause" + mouse_opaque="false" auto_resize="false" user_resize="false" layout="topleft" @@ -276,6 +277,7 @@ </layout_panel> <layout_panel name="volume_slider_ctrl" + mouse_opaque="false" auto_resize="true" user_resize="false" follows="left|right" @@ -300,6 +302,7 @@ </layout_panel> <layout_panel name="mute" + mouse_opaque="false" auto_resize="false" user_resize="false" layout="topleft" @@ -328,6 +331,7 @@ </layout_panel> <layout_panel name="zoom" + mouse_opaque="false" auto_resize="false" user_resize="false" layout="topleft" @@ -355,6 +359,7 @@ </layout_panel> <layout_panel name="unzoom" + mouse_opaque="false" auto_resize="false" user_resize="false" layout="topleft" @@ -383,6 +388,7 @@ <layout_panel name="right_bookend" width="0" + mouse_opaque="false" user_resize="false" /> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml index cc60b97f92..66ef373168 100644 --- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel name="Outfits" + bg_alpha_color="DkGray" + bg_opaque_color="DkGray" + background_opaque="true" background_visible="true" follows="all" height="570" @@ -11,15 +14,15 @@ border="false"> <tab_container follows="all" - height="490" + height="497" layout="topleft" - left="6" + left="7" name="appearance_tabs" tab_min_width="140" tab_height="30" tab_position="top" halign="center" - width="315"> + width="312"> <inventory_panel background_visible="true" background_opaque="true" @@ -30,7 +33,7 @@ border="false" left="0" top="0" - width="314" + width="315" mouse_opaque="true" name="outfitslist_tab" start_folder="My Outfits" /> @@ -47,53 +50,53 @@ mouse_opaque="true" name="cof_tab" start_folder="Current Outfit" - width="313" /> + width="315" /> </tab_container> <panel - bg_opaque_color="DkGray2" - bg_alpha_color="DkGray2" background_visible="true" - background_opaque="true" - follows="left|right|bottom" - height="38" - layout="topleft" - left="9" - visible="true" - top_pad="-1" - width="310" /> - <panel - background_visible="false" follows="bottom|left" height="73" layout="topleft" left="9" + top_pad="3" visible="true" name="bottom_panel" - top_pad="-38" width="310"> <button follows="bottom|left" tool_tip="Show additional options" - height="18" - image_disabled="OptionsMenu_Disabled" - image_selected="OptionsMenu_Press" - image_unselected="OptionsMenu_Off" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" layout="topleft" - left="8" + left="1" name="options_gear_btn" - top="14" - width="18" /> + top="1" + width="31" /> + <icon + follows="bottom|left" + height="25" + image_name="Toolbar_Middle_Off" + layout="topleft" + left_pad="1" + name="dummy_icon" + width="241" + /> + <dnd_button - follows="bottom|right" - height="18" - image_selected="TrashItem_Press" - image_unselected="TrashItem_Off" + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Right_Over" + image_overlay="TrashItem_Off" + image_selected="Toolbar_Right_Selected" + image_unselected="Toolbar_Right_Off" layout="topleft" - right="-9" + left_pad="1" name="trash_btn" tool_tip="Remove selected item" - top="14" - width="18" /> + width="31"/> <button follows="bottom|left" height="23" @@ -101,7 +104,7 @@ layout="topleft" name="make_outfit_btn" tool_tip="Save appearance as an outfit" - top="43" + top_pad="6" left="0" width="153" /> <button @@ -111,7 +114,6 @@ layout="topleft" name="wear_btn" left_pad="3" - top="43" tool_tip="Wear selected outfit" width="152" /> <button @@ -126,4 +128,4 @@ width="20" /> </panel> -</panel> +</panel>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index 13791a6d32..85841da48f 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -2,13 +2,13 @@ <!-- Side tray panel --> <panel follows="all" + height="449" label="People" layout="topleft" - height="449" + left="0" min_height="350" name="people_panel" top="0" - left="0" width="333"> <string name="no_people" @@ -39,7 +39,6 @@ name="no_groups_msg" value="[secondlife:///app/search/groups Try searching for some groups to join.]" /> <filter_editor - text_pad_left="10" follows="left|top|right" height="23" layout="topleft" @@ -48,6 +47,7 @@ max_length="300" name="filter_input" text_color="Black" + text_pad_left="10" top="3" width="303" /> <tab_container @@ -63,10 +63,10 @@ halign="center" width="317"> <panel - bg_opaque_color="DkGray2" - bg_alpha_color="DkGray2" - background_visible="true" - background_opaque="true" + background_opaque="true" + background_visible="true" + bg_alpha_color="DkGray" + bg_opaque_color="DkGray" follows="all" height="383" label="NEARBY" @@ -78,56 +78,70 @@ width="313"> <avatar_list allow_select="true" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" follows="all" - height="345" + height="352" ignore_online_status="true" layout="topleft" - left="0" + left="3" multi_select="true" name="avatar_list" top="0" - width="313" /> + width="307" /> <panel + background_visible="true" follows="left|right|bottom" - height="38" + height="27" label="bottom_panel" layout="topleft" - left="0" + left="3" name="bottom_panel" width="313"> <button follows="bottom|left" - tool_tip="Options" - height="18" - image_disabled="OptionsMenu_Disabled" - image_selected="OptionsMenu_Press" - image_unselected="OptionsMenu_Off" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" layout="topleft" - left="10" + left="0" name="nearby_view_sort_btn" - top="10" - width="18" /> + tool_tip="Options" + top="1" + width="31" /> <button follows="bottom|left" - height="18" - image_selected="AddItem_Press" - image_unselected="AddItem_Off" - image_disabled="AddItem_Disabled" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="AddItem_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" layout="topleft" - left_pad="10" + left_pad="1" name="add_friend_btn" tool_tip="Add selected Resident to your friends List" - width="18"> + width="31"> <commit_callback function="People.addFriend" /> </button> + <icon + follows="bottom|left" + height="25" + image_name="Toolbar_Right_Off" + layout="topleft" + left_pad="1" + name="dummy_icon" + width="241" + /> </panel> </panel> <panel - bg_opaque_color="DkGray2" - bg_alpha_color="DkGray2" - background_visible="true" - background_opaque="true" + background_opaque="true" + background_visible="true" + bg_alpha_color="DkGray" + bg_opaque_color="DkGray" follows="all" height="383" label="MY FRIENDS" @@ -138,13 +152,16 @@ top="0" width="313"> <accordion + background_visible="true" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" follows="all" - height="345" + height="352" layout="topleft" - left="0" + left="3" name="friends_accordion" top="0" - width="313"> + width="307"> <accordion_tab layout="topleft" height="172" @@ -160,7 +177,7 @@ multi_select="true" name="avatars_online" top="0" - width="313" /> + width="307" /> </accordion_tab> <accordion_tab layout="topleft" @@ -176,53 +193,64 @@ multi_select="true" name="avatars_all" top="0" - width="313" /> + width="307" /> </accordion_tab> </accordion> <panel + background_visible="true" follows="left|right|bottom" - height="38" + height="27" label="bottom_panel" layout="topleft" - left="0" + left="3" name="bottom_panel" width="313"> <button follows="bottom|left" tool_tip="Options" - height="18" - image_disabled="OptionsMenu_Disabled" - image_selected="OptionsMenu_Press" - image_unselected="OptionsMenu_Off" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" layout="topleft" - left="10" + left="0" name="friends_viewsort_btn" - top="10" - width="18" /> + top="1" + width="31" /> <button follows="bottom|left" - height="18" - image_selected="AddItem_Press" - image_unselected="AddItem_Off" - image_disabled="AddItem_Disabled" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="AddItem_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" layout="topleft" - left_pad="10" + left_pad="1" name="add_btn" tool_tip="Offer friendship to a Resident" - width="18" /> + width="31" /> + <icon + follows="bottom|left" + height="25" + image_name="Toolbar_Middle_Off" + layout="topleft" + left_pad="1" + name="dummy_icon" + width="210" + /> <button follows="bottom|left" - height="18" - image_selected="TrashItem_Press" - image_unselected="TrashItem_Off" - image_disabled="TrashItem_Disabled" + height="25" + image_hover_unselected="Toolbar_Right_Over" + image_overlay="TrashItem_Off" + image_selected="Toolbar_Right_Selected" + image_unselected="Toolbar_Right_Off" layout="topleft" - left_pad="10" - right="-10" + left_pad="1" name="del_btn" tool_tip="Remove selected person from your Friends list" - top_delta="0" - width="18" /> + width="31" /> </panel> <text follows="all" @@ -237,10 +265,10 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t </text> </panel> <panel - bg_opaque_color="DkGray2" - bg_alpha_color="DkGray2" - background_visible="true" - background_opaque="true" + background_opaque="true" + background_visible="true" + bg_alpha_color="DkGray" + bg_opaque_color="DkGray" follows="all" height="383" label="MY GROUPS" @@ -255,18 +283,22 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t Values are set from appropriate strings at the top of file via LLPeoplePanel::postBuild() --> <group_list + background_visible="true" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" follows="all" - height="345" + height="352" layout="topleft" - left="0" + left="3" name="group_list" no_filtered_groups_msg="[secondlife:///app/search/groups Try finding the group in search?]" no_groups_msg="[secondlife:///app/search/groups Try searching for some groups to join.]" top="0" - width="313" /> + width="307" /> <panel + background_visible="true" follows="left|right|bottom" - height="38" + height="27" label="bottom_panel" layout="topleft" left="0" @@ -275,45 +307,56 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t <button follows="bottom|left" tool_tip="Options" - height="18" - image_disabled="OptionsMenu_Disabled" - image_selected="OptionsMenu_Press" - image_unselected="OptionsMenu_Off" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" layout="topleft" - left="10" + left="3" name="groups_viewsort_btn" - top="10" - width="18" /> + top="1" + width="31" /> <button follows="bottom|left" - height="18" - image_selected="AddItem_Press" - image_unselected="AddItem_Off" - image_disabled="AddItem_Disabled" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="AddItem_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" layout="topleft" - left_pad="10" + left_pad="1" name="plus_btn" tool_tip="Join group/Create new group" - width="18" /> + width="31" /> <button follows="bottom|left" - height="10" - image_hover_selected="Activate_Checkmark" - image_selected="Activate_Checkmark" - image_unselected="Activate_Checkmark" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="Activate_Checkmark" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" layout="topleft" - left_pad="10" + left_pad="1" name="activate_btn" tool_tip="Activate selected group" - top_delta="4" - width="10" /> + width="31" /> + <icon + follows="bottom|left" + height="25" + image_name="Toolbar_Right_Off" + layout="topleft" + left_pad="1" + name="dummy_icon" + width="209" + /> </panel> </panel> <panel - bg_opaque_color="DkGray2" - bg_alpha_color="DkGray2" - background_visible="true" - background_opaque="true" + background_opaque="true" + background_visible="true" + bg_alpha_color="DkGray" + bg_opaque_color="DkGray" follows="all" height="383" label="RECENT" @@ -325,18 +368,22 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t width="313"> <avatar_list allow_select="true" + background_visible="true" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" follows="all" - height="345" + height="352" layout="topleft" - left="0" + left="3" multi_select="true" name="avatar_list" show_last_interaction_time="true" top="0" - width="313" /> + width="307" /> <panel + background_visible="true" follows="left|right|bottom" - height="38" + height="27" label="bottom_panel" layout="topleft" left="0" @@ -345,30 +392,40 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t <button follows="bottom|left" tool_tip="Options" - height="18" - image_disabled="OptionsMenu_Disabled" - image_selected="OptionsMenu_Press" - image_unselected="OptionsMenu_Off" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" layout="topleft" - left="10" + left="3" name="recent_viewsort_btn" - top="10" - width="18" /> + top="1" + width="31" /> <button follows="bottom|left" - height="18" - image_selected="AddItem_Press" - image_unselected="AddItem_Off" - image_disabled="AddItem_Disabled" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="AddItem_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" layout="topleft" - left_pad="10" + left_pad="1" name="add_friend_btn" - top_delta="0" tool_tip="Add selected Resident to your friends List" - width="18"> + width="31"> <commit_callback function="People.addFriend" /> </button> + <icon + follows="bottom|left" + height="25" + image_name="Toolbar_Right_Off" + layout="topleft" + left_pad="1" + name="dummy_icon" + width="241" + /> </panel> </panel> </tab_container> @@ -377,7 +434,7 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t height="23" layout="topleft" left="8" - top_pad="0" + top_pad="4" name="button_bar" width="313"> <button @@ -387,6 +444,7 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t layout="topleft" name="view_profile_btn" tool_tip="Show picture, groups, and other Residents information" + top="0" width="70" /> <button follows="bottom|left" diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml index ff5d89470c..c61007a9e1 100644 --- a/indra/newview/skins/default/xui/en/panel_places.xml +++ b/indra/newview/skins/default/xui/en/panel_places.xml @@ -65,7 +65,7 @@ background_visible="true" visible="false" width="315" /> <panel - height="19" + height="23" layout="topleft" left="4" name="button_panel" 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_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_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/panel_teleport_history.xml b/indra/newview/skins/default/xui/en/panel_teleport_history.xml index 0d4f67f94c..cbcaf1a58c 100644 --- a/indra/newview/skins/default/xui/en/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/en/panel_teleport_history.xml @@ -1,17 +1,19 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel name="Teleport History" bottom="0" height="400" left="0" width="380" +<panel name="Teleport History" bottom="0" height="400" left="0" width="313" help_topic="panel_teleport_history" - border="false" follows="left|top|right|bottom"> + border="false" follows="left|top|right|bottom" + background_visible="true" + bg_alpha_color="DkGray"> <accordion follows="left|top|right|bottom" - height="368" + height="369" layout="topleft" - left="0" + left="3" top="0" name="history_accordion" background_visible="true" bg_alpha_color="DkGray2" - width="380"> + width="307"> <accordion_tab layout="topleft" name="today" @@ -23,7 +25,7 @@ left="0" name="today_items" top="0" - width="380"> + width="307"> </flat_list_view> </accordion_tab> <accordion_tab @@ -37,7 +39,7 @@ left="0" name="yesterday_items" top="0" - width="380"> + width="307"> </flat_list_view> </accordion_tab> <accordion_tab @@ -51,7 +53,7 @@ left="0" name="2_days_ago" top="0" - width="380"> + width="307"> </flat_list_view> </accordion_tab> <accordion_tab @@ -65,7 +67,7 @@ left="0" name="3_days_ago" top="0" - width="380"> + width="307"> </flat_list_view> </accordion_tab> <accordion_tab @@ -79,7 +81,7 @@ left="0" name="4_days_ago" top="0" - width="380"> + width="307"> </flat_list_view> </accordion_tab> <accordion_tab @@ -93,7 +95,7 @@ left="0" name="5_days_ago_items" top="0" - width="380"> + width="307"> </flat_list_view> </accordion_tab> <accordion_tab @@ -107,7 +109,7 @@ left="0" name="6_days_and_older_items" top="0" - width="380"> + width="307"> </flat_list_view> </accordion_tab> <accordion_tab @@ -121,7 +123,7 @@ left="0" name="1_month_and_older_items" top="0" - width="380"> + width="307"> </flat_list_view> </accordion_tab> <accordion_tab @@ -135,34 +137,41 @@ left="0" name="6_months_and_older_items" top="0" - width="380"> + width="307"> </flat_list_view> </accordion_tab> </accordion> <panel - bg_opaque_color="DkGray2" - bg_alpha_color="DkGray2" - background_visible="true" - background_opaque="true" + background_visible="true" bevel_style="none" bottom="0" follows="left|right|bottom" - height="38" + height="27" layout="bottomleft" - left="0" + left="3" name="bottom_panel" - width="380"> + width="313"> <button follows="bottom|left" tool_tip="Show additional options" - height="18" - image_disabled="OptionsMenu_Disabled" - image_selected="OptionsMenu_Press" - image_unselected="OptionsMenu_Off" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" layout="topleft" - left="10" + left="0" name="gear_btn" - top="14" - width="18" /> + top="1" + width="31" /> + <icon + follows="bottom|left" + height="25" + image_name="Toolbar_Right_Off" + layout="topleft" + left_pad="1" + name="dummy_icon" + width="273" + /> </panel> </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..b840fdd31b 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml @@ -403,7 +403,7 @@ top_pad="10" layout="topleft" name="button_panel" left="5" - bottom="2" + top_pad="0" width="313"> <button height="23" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 111daec242..00bbbd65d0 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -56,7 +56,9 @@ <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 --> @@ -79,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> @@ -95,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 (⌘W)</string> <string name="BUTTON_CLOSE_WIN">Close (Ctrl+W)</string> @@ -1836,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> @@ -1892,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> <!-- are used for Friends and Friends/All folders in Inventory "Calling cards" folder. See EXT-694--> <string name="InvFolder Friends">Friends</string> @@ -2121,6 +2139,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 'busy mode' which means they have requested not to be disturbed. Your message will still be shown in their IM panel for later viewing.</string> @@ -2183,7 +2202,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 @@ -3031,14 +3051,48 @@ 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="giving">Giving</string> - <string name="uploading_costs">Uploading costs</string> - <string name="this_costs">This costs</string> - <string name="buying_selected_land">Buying selected land</string> - <string name="this_object_costs">This object costs"</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" |