diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en')
60 files changed, 1687 insertions, 2962 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index b5be03346e..a6a4c79da4 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -49,7 +49,7 @@ libcurl Version: [LIBCURL_VERSION] J2C Decoder Version: [J2C_VERSION] Audio Driver Version: [AUDIO_DRIVER_VERSION] Qt Webkit Version: [QT_WEBKIT_VERSION] -Voice Server Version: [VOICE_VERSION] +Vivox Version: [VIVOX_VERSION] </floater.string> <floater.string name="none"> 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 99bf3e6bc1..59f1889808 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -108,9 +108,6 @@ name="no_selection_text"> No parcel selected. </panel.string> - <panel.string name="time_stamp_template"> - [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] - </panel.string> <text type="string" length="1" @@ -191,10 +188,9 @@ type="string" length="1" follows="left|top" - height="20" + height="16" layout="topleft" left_pad="2" - valign="center" name="ContentRatingText" top_delta="0" width="250"> @@ -208,7 +204,7 @@ layout="topleft" left="10" name="Owner:" - top_pad="1" + top_pad="5" width="100"> Owner: </text> @@ -730,10 +726,8 @@ Leyla Linden </text> height="16" layout="topleft" left_pad="10" - top_delta="-3" mouse_opaque="false" name="region_maturity_text" - valign="center" width="150"> Adult </text> @@ -746,7 +740,6 @@ Leyla Linden </text> left="10" mouse_opaque="false" name="resellable_lbl" - top_pad="9" width="100"> Resale: </text> @@ -760,7 +753,7 @@ Leyla Linden </text> mouse_opaque="false" name="resellable_clause" word_wrap="true" - width="360"> + width="330"> Land in this region may not be resold. </text> <text @@ -829,7 +822,7 @@ Leyla Linden </text> name="Simulator primitive usage:" top_pad="4" width="364"> - Primitive usage: + Primative usage: </text> <text type="string" @@ -1068,8 +1061,7 @@ Leyla Linden </text> left="10" name="Autoreturn" top_pad="0" - width="412" - wrap="true"> + width="310"> Auto return other Residents' objects (minutes, 0 for off): </text> <line_editor @@ -1081,9 +1073,9 @@ Leyla Linden </text> layout="topleft" max_length="6" name="clean other time" - left_pad="0" - width="46" - top_delta="-2"/> + right="-72" + width="56" + top_delta="-6"/> <text type="string" length="1" @@ -1472,10 +1464,8 @@ Only large parcels can be listed in search. left="14" name="MatureCheck" top="177" - label_text.valign="center" - label_text.v_pad="-5" tool_tip=" " - width="200" /> + width="107" /> <text type="string" length="1" @@ -1495,7 +1485,6 @@ Only large parcels can be listed in search. layout="topleft" left="14" name="snapshot_ctrl" - fallback_image="default_land_picture.j2c" tool_tip="Click to choose a picture" width="195" /> <text @@ -1930,8 +1919,6 @@ Only large parcels can be listed in search. left_delta="0" name="public_access" top_pad="5" - label_text.valign="center" - label_text.v_pad="-7" width="278" /> <text type="string" @@ -1942,7 +1929,7 @@ Only large parcels can be listed in search. left_delta="20" name="Only Allow" top="49" - width="325"> + width="278"> Restrict Access to Residents verified by: </text> <check_box diff --git a/indra/newview/skins/default/xui/en/floater_buy_land.xml b/indra/newview/skins/default/xui/en/floater_buy_land.xml index c88de878f4..df44b61632 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml @@ -174,15 +174,12 @@ supports [AMOUNT2] objects </floater.string> <floater.string name="icon_PG" - translate="false" value="Parcel_PG_Dark"/> <floater.string name="icon_M" - translate="false" value="Parcel_M_Dark"/> <floater.string name="icon_R" - translate="false" value="Parcel_R_Dark"/> <text type="string" @@ -380,7 +377,6 @@ supports [AMOUNT2] objects width="275" /> <texture_picker enabled="false" - fallback_image="default_land_picture.j2c" follows="top|left" height="135" layout="topleft" @@ -529,14 +525,13 @@ sold with objects length="1" follows="top|left" font="SansSerifBig" - height="32" + height="16" layout="topleft" left="72" name="account_action" right="438" top="200" - width="218" - wrap="true"> + width="218"> Upgrade you to premium membership. </text> <text @@ -578,21 +573,19 @@ sold with objects layout="topleft" left="0" name="step_2" - top_pad="-10" width="64" /> <text type="string" length="1" follows="top|left" font="SansSerifBig" - height="32" + height="16" layout="topleft" left="72" name="land_use_action" right="438" top="284" - width="218" - wrap="true"> + width="218"> Increase your monthly land use fees to US$ 40/month. </text> <text @@ -623,15 +616,14 @@ This parcel is 512 m² of land. <text type="string" length="1" - bottom_delta="-22" + bottom_delta="-38" follows="top|left" font="SansSerifBig" - height="32" + height="16" layout="topleft" left="72" name="purchase_action" - right="438" - wrap="true"> + right="438"> Pay Joe Resident L$ 4000 for the land </text> <text @@ -669,7 +661,7 @@ This parcel is 512 m² of land. layout="topleft" left="170" name="currency_amt" - top="424" + top="408" width="80"> 1000 </line_editor> @@ -685,7 +677,7 @@ This parcel is 512 m² of land. layout="topleft" left="260" name="currency_est" - top="425" + top="409" width="178"> for approx. [LOCAL_AMOUNT] </text> @@ -717,7 +709,7 @@ This parcel is 512 m² of land. layout="topleft" left="70" name="buy_btn" - top="460" + top="448" width="100" /> <button follows="bottom|right" diff --git a/indra/newview/skins/default/xui/en/floater_event.xml b/indra/newview/skins/default/xui/en/floater_event.xml index 887cedc33f..d9c9d63c72 100644 --- a/indra/newview/skins/default/xui/en/floater_event.xml +++ b/indra/newview/skins/default/xui/en/floater_event.xml @@ -266,6 +266,7 @@ layout="topleft" left="6" name="create_event_btn" + picture_style="true" tool_tip="Create Event" width="18" /> <button @@ -279,6 +280,7 @@ left="6" top_pad="-7" name="god_delete_event_btn" + picture_style="true" tool_tip="Delete Event" width="18" /> <button diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml index e123de46c2..65a05f3ec5 100644 --- a/indra/newview/skins/default/xui/en/floater_im_container.xml +++ b/indra/newview/skins/default/xui/en/floater_im_container.xml @@ -11,7 +11,7 @@ save_visibility="true" single_instance="true" title="CONVERSATIONS" - width="396"> + width="392"> <tab_container follows="left|right|top|bottom" height="390" @@ -27,14 +27,7 @@ halign="left" use_ellipses="true" top="0" - width="394"> - <first_tab - tab_bottom_image_flash="Toolbar_Left_Flash"/> - <middle_tab - tab_bottom_image_flash="Toolbar_Middle_Flash"/> - <last_tab - tab_bottom_image_flash="Toolbar_Right_Flash"/> - </tab_container> + width="390" /> <icon color="DefaultShadowLight" enabled="false" @@ -45,5 +38,5 @@ left="1" name="im_box_tab_container_icon" bottom="10" - width="394" /> + width="390" /> </multi_floater> diff --git a/indra/newview/skins/default/xui/en/floater_map.xml b/indra/newview/skins/default/xui/en/floater_map.xml index efd96624ab..e21e44204d 100644 --- a/indra/newview/skins/default/xui/en/floater_map.xml +++ b/indra/newview/skins/default/xui/en/floater_map.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater bg_alpha_image_overlay="DkGray_66" - legacy_header_height="0" + legacy_header_height="18" can_minimize="true" can_resize="true" follows="top|right" - height="174" + height="218" layout="topleft" min_height="174" min_width="174" name="Map" - title="" + title="Mini Map" help_topic="map" save_rect="true" save_visibility="true" @@ -54,9 +54,6 @@ name="ToolTipMsg"> [AGENT][REGION](Double-click to open Map) </floater.string> - <floater.string name="mini_map_caption"> - MINIMAP - </floater.string> <net_map bg_color="NetMapBackgroundColor" follows="top|left|bottom|right" @@ -65,8 +62,8 @@ mouse_opaque="false" name="Net Map" width="200" - height="218" - top="0"/> + height="200" + top="18"/> <text type="string" length="1" 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 0e8eef2a21..14c0081c0d 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml @@ -84,18 +84,8 @@ label="Save" label_selected="Save" layout="topleft" - left="178" - name="Save" - top="332" - width="100" /> - <button - follows="right|bottom" - height="22" - label="Delete" - label_selected="Delete" - layout="topleft" left="288" - name="Delete" + name="Save" top="332" width="100" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index a96dbe3553..cc9e72cfb5 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -11,7 +11,6 @@ save_rect="true" short_title="BUILD TOOLS" single_instance="true" - save_visibility="true" sound_flags="0" width="295"> <floater.string @@ -220,8 +219,8 @@ </radio_group> <radio_group follows="left|top" - left="5" - top="59" + left="10" + top="54" height="70" layout="topleft" name="edit_radio_group"> @@ -254,8 +253,7 @@ control_name="EditLinkedParts" label="Edit linked" layout="topleft" - name="checkbox edit linked parts" - top_pad="0"> + name="checkbox edit linked parts" > <check_box.commit_callback function="BuildTool.selectComponent"/> </check_box> @@ -275,31 +273,20 @@ <check_box control_name="ScaleUniform" height="19" - label="" + label="Stretch Both Sides" layout="topleft" left="143" name="checkbox uniform" top="50" - width="20" /> - <text - height="19" - label="Stretch Both Sides" - left="163" - name="checkbox uniform label" - top="55" - width="120" - wrap="true"> - Stretch Both Sides - </text> + width="134" /> <check_box control_name="ScaleStretchTextures" height="19" initial_value="true" label="Stretch Textures" layout="topleft" - left="143" name="checkbox stretch textures" - top_pad="7" + top_pad="0" width="134" /> <check_box control_name="SnapEnabled" @@ -307,7 +294,7 @@ initial_value="true" label="Snap to grid" layout="topleft" - top_pad="0" + top_pad="7" name="checkbox snap to grid" width="134" /> <combo_box @@ -316,7 +303,6 @@ follows="left|top" name="combobox grid mode" tool_tip="Choose the type of grid ruler for positioning the object" - top_pad="0" width="108"> <combo_box.item label="World grid" @@ -335,6 +321,7 @@ </combo_box> <button left_pad="0" + image_disabled="ForwardArrow_Disabled" image_selected="ForwardArrow_Press" image_unselected="ForwardArrow_Off" layout="topleft" @@ -593,7 +580,7 @@ layout="topleft" left="0" name="radio select land" - top="-106" + top="-1" width="134" /> <radio_item height="19" @@ -823,7 +810,7 @@ height="10" left="10" name="Name:" - top="5" + top="0" width="90"> Name: </text> @@ -910,34 +897,29 @@ width="75"> Group: </text> - <name_box - follows="left|top" - height="18" - initial_value="Loading..." - layout="topleft" - left_pad="23" - name="Group Name Proxy" - width="142" /> <button follows="top|left" - height="23" - image_overlay="Edit_Wrench" + height="10" + image_disabled="Activate_Checkmark" + image_selected="Activate_Checkmark" + image_unselected="Activate_Checkmark" + image_color="White_50" layout="topleft" - left_pad="3" + left_pad="0" + top_delta="0" name="button set group" tab_stop="false" tool_tip="Choose a group to share this object's permissions" - width="23" /> - <check_box - height="19" + width="10" /> + <name_box follows="left|top" - label="Share" + height="18" + initial_value="Loading..." layout="topleft" - name="checkbox share with group" - tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions." - top_pad="10" - left="106" - width="87" /> + left_pad="5" + top_delta="-1" + name="Group Name Proxy" + width="150" /> <button follows="top|left" height="23" @@ -945,16 +927,26 @@ label_selected="Deed" layout="topleft" name="button deed" - left_pad="3" + top_pad="0" + 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 + height="19" + follows="left|top" + label="Share" + layout="topleft" + name="checkbox share with group" + tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions." + left_pad="3" + width="100" /> <text type="string" length="1" follows="left|top" height="16" layout="topleft" - top_pad="10" + top_pad="15" left="10" name="label click action" width="98"> @@ -1006,7 +998,7 @@ follows="left|top" allow_text_entry="false" height="23" - initial_value="2" + intial_value="2" max_chars="20" mouse_opaque="true" name="sale type" @@ -2170,6 +2162,8 @@ even though the user gets a free copy. width="60" /> <color_swatch can_apply_immediately="true" + bevel_style="none" + border_style="line" color="0.5 0.5 0.5 1" border.border_thickness="0" follows="left|top" @@ -2204,71 +2198,43 @@ even though the user gets a free copy. name="Light Intensity" top_pad="3" width="128" /> - <spinner bottom_delta="0" - decimal_digits="3" - follows="left|top" - height="16" - increment="0.1" - initial_value="0.5" - label="FOV" - label_width="55" - left="144" - max_val="3" - min_val="0" - mouse_opaque="true" - name="Light FOV" - width="120" /> - <spinner follows="left|top" - height="19" - initial_value="5" - label="Radius" - label_width="70" - layout="topleft" - left="10" - max_val="20" - name="Light Radius" - top_pad="3" - width="128" /> - <spinner bottom_delta="0" - decimal_digits="3" - follows="left|top" - height="16" - increment="0.5" - initial_value="0.5" - label="Focus" - label_width="55" - left="144" - max_val="20" - min_val="-20" - mouse_opaque="true" - name="Light Focus" - width="120" /> - <spinner follows="left|top" - height="19" - increment="0.25" - initial_value="1" - label="Falloff" - label_width="70" - layout="topleft" - left="10" - max_val="2" - name="Light Falloff" - top_pad="3" - width="128" /> - <spinner bottom_delta="0" - decimal_digits="3" - follows="left|top" - height="16" - increment="0.05" - initial_value="1" - label="Ambiance" - label_width="55" - left="144" - max_val="1" - min_val="0" - mouse_opaque="true" - name="Light Ambiance" - width="120" /> + <spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16" + increment="0.1" initial_val="0.5" label="FOV" label_width="55" + left="144" max_val="3" min_val="0" mouse_opaque="true" + name="Light FOV" width="120" /> + <spinner + follows="left|top" + height="19" + initial_value="5" + label="Radius" + label_width="70" + layout="topleft" + left="10" + max_val="20" + name="Light Radius" + top_pad="3" + width="128" /> + <spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16" + increment="0.5" initial_val="0.5" label="Focus" label_width="55" + left="144" max_val="20" min_val="-20" mouse_opaque="true" + name="Light Focus" width="120" /> + <spinner + follows="left|top" + height="19" + increment="0.25" + initial_value="1" + label="Falloff" + label_width="70" + layout="topleft" + left="10" + max_val="2" + name="Light Falloff" + top_pad="3" + width="128" /> + <spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16" + increment="0.05" initial_val="1" label="Ambiance" label_width="55" + left="144" max_val="1" min_val="0" mouse_opaque="true" + name="Light Ambiance" width="120" /> </panel> <panel border="false" @@ -2293,7 +2259,6 @@ even though the user gets a free copy. <texture_picker can_apply_immediately="true" default_image_name="Default" - fallback_image="locked_image.j2c" follows="left|top" height="80" label="Texture" @@ -2364,7 +2329,7 @@ even though the user gets a free copy. height="19" label="Full Bright" layout="topleft" - left_delta="-5" + left_delta="0" name="checkbox fullbright" top_pad="4" width="81" /> diff --git a/indra/newview/skins/default/xui/en/inspect_object.xml b/indra/newview/skins/default/xui/en/inspect_object.xml index 8aeec46ba3..b8a7222e8e 100644 --- a/indra/newview/skins/default/xui/en/inspect_object.xml +++ b/indra/newview/skins/default/xui/en/inspect_object.xml @@ -18,8 +18,8 @@ width="228"> <string name="Creator">By [CREATOR]</string> <string name="CreatorAndOwner"> -By [CREATOR] -Owner [OWNER] +by [CREATOR] +owner [OWNER] </string> <string name="Price">L$[AMOUNT]</string> <string name="PriceFree">Free!</string> @@ -29,50 +29,61 @@ Owner [OWNER] allow_html="false" follows="all" font="SansSerifLarge" - height="30" + height="16" left="8" name="object_name" text_color="White" - top="6" + top="10" use_ellipses="true" - word_wrap="true" + value="Test Object Name That Is Really Long" width="220" /> <text follows="all" - height="50" + height="33" left="8" name="object_creator" - top_pad="6" + top_pad="0" use_ellipses="true" width="220"> by secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about owner secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about </text> + <!-- *TODO: Replace this icon --> + <icon + name="price_icon" + image_name="Icon_For_Sale" + right="-5" + width="16" + height="16" + top="56" + follows="left|top" + /> <text follows="all" font="SansSerifSmall" font.style="BOLD" - height="14" + height="16" halign="right" - right="-5" + left="5" name="price_text" text_color="white" - top="60" + top="58" font_shadow="none" - width="60"> -L$30,000 + width="196"> +L$300,000 </text> <text - clip_partial="true" + clip_partial="true" follows="all" font="SansSerifSmall" - height="25" + height="37" left="8" name="object_description" - top="76" - use_ellipses="true" + top_pad="0" + use_ellipses="true" width="220" word_wrap="true"> +This is a really long description for an object being as how it is at least 80 characters in length and maybe more like 120 at this point. Who knows, really? </text> <!-- Overlapping buttons for all default actions. Show "Buy" if for sale, "Sit" if can sit, etc. --> @@ -80,9 +91,10 @@ L$30,000 follows="all" font="SansSerifSmall" height="13" + left_delta="0" name="object_media_url" - width="220" - top_pad="0" + bottom_pad="2" + width="200" max_length = "50" use_ellipses="true"> http://www.superdupertest.com diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml index a1ca910cbb..b2e4a7ad95 100644 --- a/indra/newview/skins/default/xui/en/main_view.xml +++ b/indra/newview/skins/default/xui/en/main_view.xml @@ -64,7 +64,8 @@ left="0" mouse_opaque="false" name="world_stack" - orientation="vertical"> + orientation="vertical" + tab_stop="false"> <panel auto_resize="true" follows="all" height="500" @@ -73,17 +74,6 @@ mouse_opaque="false" name="hud container" width="500"> - <panel auto_resize="false" - follows="left|top" - height="19" - left="0" - mouse_opaque="false" - name="topinfo_bar_container" - tab_stop="false" - top="0" - user_resize="false" - visible="false" - width="1024"/> <panel follows="right|top|bottom" height="500" mouse_opaque="false" @@ -166,6 +156,13 @@ top="0" width="1024" height="768"/> + <notify_box_view top="0" + follows="all" + height="768" + mouse_opaque="false" + name="notify_container" + tab_group="-2" + width="1024"/> <panel top="0" follows="all" mouse_opaque="false" @@ -199,15 +196,7 @@ mouse_opaque="false" name="popup_holder" class="popup_holder" - width="1024"> - <icon follows="right|bottom" - image_name="Resize_Corner" - right="-1" - name="resize_corner" - width="11" - bottom="-1" - height="11" /> - </panel> + width="1024"/> <menu_holder top="0" follows="all" height="768" diff --git a/indra/newview/skins/default/xui/en/menu_edit.xml b/indra/newview/skins/default/xui/en/menu_edit.xml index fab76c497c..68f3cb532c 100644 --- a/indra/newview/skins/default/xui/en/menu_edit.xml +++ b/indra/newview/skins/default/xui/en/menu_edit.xml @@ -52,7 +52,6 @@ <menu_item_call label="Delete" name="Delete" - allow_key_repeat="true" shortcut="Del"> <menu_item_call.on_click function="Edit.Delete" /> diff --git a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml index 334decdf58..a5ac5f76e1 100644 --- a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml @@ -89,7 +89,7 @@ function="InspectAvatar.VisibleFreezeEject"/> </menu_item_call> <menu_item_call - label="Debug Textures" + label="Debug" name="debug"> <menu_item_call.on_click function="Avatar.Debug"/> diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml index 9fac296e26..4655fa8c46 100644 --- a/indra/newview/skins/default/xui/en/menu_login.xml +++ b/indra/newview/skins/default/xui/en/menu_login.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <menu_bar - follows="left|top" + follows="left|top|right" height="18" layout="topleft" left_delta="0" @@ -22,7 +22,7 @@ </menu_item_call> <menu_item_separator /> <menu_item_call - label="Exit [APP_NAME]" + label="Quit [APP_NAME]" name="Quit" shortcut="control|Q"> <menu_item_call.on_click diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 63ff7047b4..3af80f63fe 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -38,8 +38,8 @@ parameter="agent" /> </menu_item_call> <menu_item_call - label="Change Outfit" - name="ChangeOutfit"> + label="My Appearance" + name="Appearance"> <menu_item_call.on_click function="CustomizeAvatar" /> <menu_item_call.on_enable @@ -80,17 +80,6 @@ function="Floater.Toggle" parameter="gestures" /> </menu_item_check> - <menu_item_check - label="My Voice" - name="ShowVoice" - visibility_control="VoiceMorphingEnabled"> - <menu_item_check.on_check - function="Floater.Visible" - parameter="voice_effect" /> - <menu_item_check.on_click - function="Floater.Toggle" - parameter="voice_effect" /> - </menu_item_check> <menu label="My Status" name="Status" @@ -101,6 +90,7 @@ <menu_item_call.on_click function="World.SetAway" /> </menu_item_call> + <menu_item_separator/> <menu_item_call label="Busy" name="Set Busy"> @@ -126,7 +116,7 @@ </menu_item_call> <menu_item_separator/> <menu_item_call - label="Exit [APP_NAME]" + label="Quit [APP_NAME]" name="Quit" shortcut="control|Q"> <menu_item_call.on_click @@ -532,52 +522,6 @@ <menu_item_check.on_enable function="Tools.EnableToolNotPie" /> </menu_item_check> - <menu - create_jump_keys="true" - label="Select Linked Parts" - name="Select Linked Parts" - tear_off="true"> - <menu_item_call - label="Select Next Part" - name="Select Next Part" - shortcut="control|."> - <menu_item_call.on_click - function="Tools.SelectNextPart" - parameter="next" /> - <menu_item_call.on_enable - function="Tools.EnableSelectNextPart" /> - </menu_item_call> - <menu_item_call - label="Select Previous Part" - name="Select Previous Part" - shortcut="control|,"> - <menu_item_call.on_click - function="Tools.SelectNextPart" - parameter="previous" /> - <menu_item_call.on_enable - function="Tools.EnableSelectNextPart" /> - </menu_item_call> - <menu_item_call - label="Include Next Part" - name="Include Next Part" - shortcut="control|shift|."> - <menu_item_call.on_click - function="Tools.SelectNextPart" - parameter="includenext" /> - <menu_item_call.on_enable - function="Tools.EnableSelectNextPart" /> - </menu_item_call> - <menu_item_call - label="Include Previous Part" - name="Include Previous Part" - shortcut="control|shift|,"> - <menu_item_call.on_click - function="Tools.SelectNextPart" - parameter="includeprevious" /> - <menu_item_call.on_enable - function="Tools.EnableSelectNextPart" /> - </menu_item_call> - </menu> <menu_item_separator/> <menu_item_call label="Focus on Selection" @@ -707,6 +651,13 @@ label="Options" name="Options" tear_off="true"> + <menu_item_call + label="Set Default Upload Permissions" + name="perm prefs"> + <menu_item_call.on_click + function="Floater.Toggle" + parameter="perm_prefs" /> + </menu_item_call> <menu_item_check label="Show Advanced Permissions" name="DebugPermissions"> @@ -814,64 +765,48 @@ </menu> <menu create_jump_keys="true" - label="Upload" - layout="topleft" - name="Upload" + label="Select Linked Parts" + name="Select Linked Parts" tear_off="true"> <menu_item_call - label="Image (L$[COST])..." - layout="topleft" - name="Upload Image" - shortcut="control|U"> + label="Select Next Part" + name="Select Next Part" + shortcut="control|."> <menu_item_call.on_click - function="File.UploadImage" - parameter="" /> + function="Tools.SelectNextPart" + parameter="next" /> <menu_item_call.on_enable - function="File.EnableUpload" /> - <menu_item_call.on_visible - function="Upload.CalculateCosts" - parameter="Upload Image" /> + function="Tools.EnableSelectNextPart" /> </menu_item_call> <menu_item_call - label="Sound (L$[COST])..." - layout="topleft" - name="Upload Sound"> + label="Select Previous Part" + name="Select Previous Part" + shortcut="control|,"> <menu_item_call.on_click - function="File.UploadSound" - parameter="" /> + function="Tools.SelectNextPart" + parameter="previous" /> <menu_item_call.on_enable - function="File.EnableUpload" /> - <menu_item_call.on_visible - function="Upload.CalculateCosts" - parameter="Upload Sound" /> + function="Tools.EnableSelectNextPart" /> </menu_item_call> <menu_item_call - label="Animation (L$[COST])..." - layout="topleft" - name="Upload Animation"> + label="Include Next Part" + name="Include Next Part" + shortcut="control|shift|."> <menu_item_call.on_click - function="File.UploadAnim" - parameter="" /> + function="Tools.SelectNextPart" + parameter="includenext" /> <menu_item_call.on_enable - function="File.EnableUpload" /> - <menu_item_call.on_visible - function="Upload.CalculateCosts" - parameter="Upload Animation" /> - </menu_item_call> - <menu_item_call - label="Bulk (L$[COST] per file)..." - layout="topleft" - name="Bulk Upload"> - <menu_item_call.on_click - function="File.UploadBulk" - parameter="" /> + function="Tools.EnableSelectNextPart" /> </menu_item_call> <menu_item_call - label="Set Default Upload Permissions" - name="perm prefs"> + label="Include Previous Part" + name="Include Previous Part" + shortcut="control|shift|,"> <menu_item_call.on_click - function="Floater.Toggle" - parameter="perm_prefs" /> + function="Tools.SelectNextPart" + parameter="includeprevious" /> + <menu_item_call.on_enable + function="Tools.EnableSelectNextPart" /> </menu_item_call> </menu> </menu> @@ -925,7 +860,7 @@ <menu_item_check label="Show Advanced Menu" name="Show Advanced Menu" - shortcut="control|alt|shift|D"> + shortcut="control|alt|D"> <on_check function="CheckControl" parameter="UseDebugMenus" /> @@ -1404,16 +1339,6 @@ function="ToggleControl" parameter="RunMultipleThreads" /> </menu_item_check> - <menu_item_check - label="Use Plugin Read Thread" - name="Use Plugin Read Thread"> - <menu_item_check.on_check - function="CheckControl" - parameter="PluginUseReadThread" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="PluginUseReadThread" /> - </menu_item_check> <menu_item_call label="Clear Group Cache" name="ClearGroupCache"> @@ -1475,18 +1400,6 @@ <menu_item_call.on_click function="View.DefaultUISize" /> </menu_item_call> - <!-- This second, alternative shortcut for Show Advanced Menu is for backward compatibility. The main shortcut has been changed so it's Linux-friendly, where the old shortcut is typically eaten by the window manager. --> - <menu_item_check - label="Show Advanced Menu - legacy shortcut" - name="Show Advanced Menu - legacy shortcut" - shortcut="control|alt|D"> - <on_check - function="CheckControl" - parameter="UseDebugMenus" /> - <on_click - function="ToggleControl" - parameter="UseDebugMenus" /> - </menu_item_check> <menu_item_separator/> <menu_item_check label="Always Run" @@ -1642,6 +1555,15 @@ <menu_item_call.on_click function="View.ZoomOut" /> </menu_item_call> + <menu_item_separator/> + <menu_item_call + label="Toggle Fullscreen" + name="Toggle Fullscreen" + > + <!-- Note: shortcut="alt|Enter" was deleted from the preceding node--> + <menu_item_call.on_click + function="View.Fullscreen" /> + </menu_item_call> </menu> <menu_item_separator/> <menu_item_call @@ -1662,6 +1584,7 @@ function="ToggleControl" parameter="QAMode" /> </menu_item_check> + </menu> <menu create_jump_keys="true" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 3576462cca..e8ba8c683d 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -735,14 +735,6 @@ You need an account to enter [SECOND_LIFE]. Would you like to create one now? <notification icon="alertmodal.tga" - name="InvalidCredentialFormat" - type="alertmodal"> -You need to enter both the First and Last name of your avatar into the Username field, then login again. - </notification> - - - <notification - icon="alertmodal.tga" name="AddClassified" type="alertmodal"> Classified ads appear in the 'Classified' section of the Search directory and on [http://secondlife.com/community/classifieds secondlife.com] for one week. @@ -808,18 +800,7 @@ Insufficient funds to create classified. icon="alertmodal.tga" name="DeleteAvatarPick" type="alertmodal"> -Delete pick <nolink>[PICK]</nolink>? - <usetemplate - name="okcancelbuttons" - notext="Cancel" - yestext="OK"/> - </notification> - - <notification - icon="alertmodal.tga" - name="DeleteOutfits" - type="alertmodal"> - Delete the selected outfit? +Delete pick [PICK]? <usetemplate name="okcancelbuttons" notext="Cancel" @@ -1101,9 +1082,7 @@ The region [REGION] does not allow terraforming. icon="alertmodal.tga" name="CannotCopyWarning" type="alertmodal"> -You do not have permission to copy the following items: -[ITEMS] -and will lose it from your inventory if you give it away. Do you really want to offer these items? +You do not have permission to copy this item and will lose it from your inventory if you give it away. Do you really want to offer this item? <usetemplate name="okcancelbuttons" notext="No" @@ -1220,7 +1199,6 @@ Eject [AVATAR_NAME] from your land? <notification icon="alertmodal.tga" name="EjectAvatarFromGroup" - persist="true" type="notify"> You ejected [AVATAR_NAME] from group [GROUP_NAME] </notification> @@ -1406,17 +1384,6 @@ Unable to encode file: [FILE] <notification icon="alertmodal.tga" - name="CorruptedProtectedDataStore" - type="alertmodal"> - We can't fill in your username and password. This may happen when you change network setup - - <usetemplate - name="okbutton" - yestext="OK"/> - </notification> - - <notification - icon="alertmodal.tga" name="CorruptResourceFile" type="alertmodal"> Corrupt resource file: [FILE] @@ -2076,52 +2043,6 @@ Would you be my friend? name="Cancel" text="Cancel"/> </form> - <unique/> - </notification> - - <notification - icon="alertmodal.tga" - label="Save Wearable" - name="SaveWearableAs" - type="alertmodal"> - Save item to my inventory as: - <form name="form"> - <input name="message" type="text"> - [DESC] (new) - </input> - <button - default="true" - index="0" - name="Offer" - text="OK"/> - <button - index="1" - name="Cancel" - text="Cancel"/> - </form> - </notification> - - - <notification - icon="alertmodal.tga" - label="Rename Outfit" - name="RenameOutfit" - type="alertmodal"> - New outfit name: - <form name="form"> - <input name="new_name" type="text" width="300"> - [NAME] - </input> - <button - default="true" - index="0" - name="Offer" - text="OK"/> - <button - index="1" - name="Cancel" - text="Cancel"/> - </form> </notification> <notification @@ -2203,19 +2124,6 @@ Please enter a higher price. <notification icon="alertmodal.tga" - name="ConfirmItemDeleteHasLinks" - type="alertmodal"> -At least one of the items you has link items that point to it. If you delete this item, its links will permanently stop working. It is strongly advised to delete the links first. - -Are you sure you want to delete these items? - <usetemplate - name="okcancelbuttons" - notext="Cancel" - yestext="OK"/> - </notification> - - <notification - icon="alertmodal.tga" name="ConfirmObjectDeleteLock" type="alertmodal"> At least one of the items you have selected is locked. @@ -2509,57 +2417,6 @@ Please choose the male or female avatar. You can change your mind later. notext="Female" yestext="Male"/> </notification> - <notification icon="alertmodal.tga" - name="CantTeleportToGrid" - type="alertmodal"> -Could not teleport to [SLURL] as it's on a different grid ([GRID]) than the current grid ([CURRENT_GRID]). Please close your viewer and try again. - <usetemplate - name="okbutton" - yestext="OK"/> - </notification> - - <notification icon="alertmodal.tga" - name="GeneralCertificateError" - type="alertmodal"> -Could not connect to the server. -[REASON] - -SubjectName: [SUBJECT_NAME_STRING] -IssuerName: [ISSUER_NAME_STRING] -Valid From: [VALID_FROM] -Valid To: [VALID_TO] -MD5 Fingerprint: [SHA1_DIGEST] -SHA1 Fingerprint: [MD5_DIGEST] -Key Usage: [KEYUSAGE] -Extended Key Usage: [EXTENDEDKEYUSAGE] -Subject Key Identifier: [SUBJECTKEYIDENTIFIER] - <usetemplate - name="okbutton" - yestext="OK"/> - </notification> - - <notification icon="alertmodal.tga" - name="TrustCertificateError" - type="alertmodal"> -The certification authority for this server is not known. - -Certificate Information: -SubjectName: [SUBJECT_NAME_STRING] -IssuerName: [ISSUER_NAME_STRING] -Valid From: [VALID_FROM] -Valid To: [VALID_TO] -MD5 Fingerprint: [SHA1_DIGEST] -SHA1 Fingerprint: [MD5_DIGEST] -Key Usage: [KEYUSAGE] -Extended Key Usage: [EXTENDEDKEYUSAGE] -Subject Key Identifier: [SUBJECTKEYIDENTIFIER] - -Would you like to trust this authority? - <usetemplate - name="okcancelbuttons" - notext="Cancel" - yestext="Trust"/> - </notification> <notification icon="alertmodal.tga" @@ -2571,7 +2428,6 @@ Would you like to trust this authority? <notification icon="alertmodal.tga" name="GrantedModifyRights" - persist="true" type="notify"> [NAME] has given you permission to edit their objects. </notification> @@ -2579,7 +2435,6 @@ Would you like to trust this authority? <notification icon="alertmodal.tga" name="RevokedModifyRights" - persist="true" type="notify"> Your privilege to modify [NAME]'s objects has been revoked </notification> @@ -3509,7 +3364,7 @@ You are not allowed in that region due to your maturity Rating. type="alertmodal"> You are not allowed in that Region due to your maturity Rating preference. -To enter the desired region, please change your maturity Rating preference. This will allow you to search for and access [REGIONMATURITY] content. To undo any changes, go to Me > Preferences > General. +You can click 'Change Preference' to raise your maturity Rating preference now and allow you to enter. You will be able to search and access [REGIONMATURITY] content from now on. If you later want to change this setting back, go to Me > Preferences > General. <form name="form"> <button index="0" @@ -3525,13 +3380,6 @@ To enter the desired region, please change your maturity Rating preference. This </notification> <notification - icon="notifytip.tga" - name="PreferredMaturityChanged" - type="notifytip"> -Your maturity Rating preference is now [RATING]. - </notification> - - <notification icon="alertmodal.tga" name="LandClaimAccessBlocked" type="alertmodal"> @@ -4494,7 +4342,6 @@ Replaced missing clothing/body part with default. <notification icon="groupnotify" name="GroupNotice" - persist="true" type="groupnotify"> Topic: [SUBJECT], Message: [MESSAGE] </notification> @@ -4531,7 +4378,6 @@ Uploading in-world and web site snapshots... <notification icon="notify.tga" name="UploadPayment" - persist="true" type="notify"> You paid L$[AMOUNT] to upload. </notification> @@ -4819,7 +4665,6 @@ Please select at least one type of content to search (General, Moderate, or Adul <notification icon="notify.tga" name="SystemMessage" - persist="true" type="notify"> [MESSAGE] </notification> @@ -4827,13 +4672,10 @@ Please select at least one type of content to search (General, Moderate, or Adul <notification icon="notify.tga" name="PaymentRecived" - persist="true" type="notify"> [MESSAGE] </notification> - <!-- EventNotification couldn't be persist since server decide is it necessary to notify - user about subscribed event via LLEventNotifier--> <notification icon="notify.tga" name="EventNotification" @@ -4861,7 +4703,6 @@ Event Notification: <notification icon="notify.tga" name="TransferObjectsHighlighted" - persist="true" type="notify"> All objects on this parcel that will transfer to the purchaser of this parcel are now highlighted. @@ -4877,7 +4718,6 @@ All objects on this parcel that will transfer to the purchaser of this parcel ar <notification icon="notify.tga" name="DeactivatedGesturesTrigger" - persist="true" type="notify"> Deactivated gestures with same trigger: [NAMES] @@ -4886,7 +4726,6 @@ Deactivated gestures with same trigger: <notification icon="notify.tga" name="NoQuickTime" - persist="true" type="notify"> Apple's QuickTime software does not appear to be installed on your system. If you want to view streaming media on parcels that support it you should go to the [http://www.apple.com/quicktime QuickTime site] and install the QuickTime Player. @@ -4894,13 +4733,8 @@ If you want to view streaming media on parcels that support it you should go to <notification icon="notify.tga" name="NoPlugin" - persist="true" type="notify"> No Media Plugin was found to handle the "[MIME_TYPE]" mime type. Media of this type will be unavailable. - <unique> - <context key="[MIME_TYPE]"/> - </unique> - </notification> <notification icon="alertmodal.tga" @@ -4918,7 +4752,6 @@ Please re-install the plugin or contact the vendor if you continue to experience <notification icon="notify.tga" name="OwnedObjectsReturned" - persist="true" type="notify"> The objects you own on the selected parcel of land have been returned back to your inventory. </notification> @@ -4926,7 +4759,6 @@ The objects you own on the selected parcel of land have been returned back to yo <notification icon="notify.tga" name="OtherObjectsReturned" - persist="true" type="notify"> The objects on the selected parcel of land that is owned by [FIRST] [LAST] have been returned to his or her inventory. </notification> @@ -4934,7 +4766,6 @@ The objects on the selected parcel of land that is owned by [FIRST] [LAST] have <notification icon="notify.tga" name="OtherObjectsReturned2" - persist="true" type="notify"> The objects on the selected parcel of land owned by the Resident '[NAME]' have been returned to their owner. </notification> @@ -4942,7 +4773,6 @@ The objects on the selected parcel of land owned by the Resident '[NAME]&ap <notification icon="notify.tga" name="GroupObjectsReturned" - persist="true" type="notify"> The objects on the selected parcel of land shared with the group [GROUPNAME] have been returned back to their owner's inventory. Transferable deeded objects have been returned to their previous owners. @@ -4952,7 +4782,6 @@ Non-transferable objects that are deeded to the group have been deleted. <notification icon="notify.tga" name="UnOwnedObjectsReturned" - persist="true" type="notify"> The objects on the selected parcel that are NOT owned by you have been returned to their owners. </notification> @@ -4960,7 +4789,6 @@ The objects on the selected parcel that are NOT owned by you have been returned <notification icon="notify.tga" name="ServerObjectMessage" - persist="true" type="notify"> Message from [NAME]: <nolink>[MSG]</nolink> @@ -4969,7 +4797,6 @@ Message from [NAME]: <notification icon="notify.tga" name="NotSafe" - persist="true" type="notify"> This land has damage enabled. You can be hurt here. If you die, you will be teleported to your home location. @@ -4979,7 +4806,6 @@ You can be hurt here. If you die, you will be teleported to your home location. <notification icon="notify.tga" name="NoFly" - persist="true" type="notify"> This area has flying disabled. You can't fly here. @@ -4989,7 +4815,6 @@ You can't fly here. <notification icon="notify.tga" name="PushRestricted" - persist="true" type="notify"> This area does not allow pushing. You can't push others here unless you own the land. <unique/> @@ -4998,7 +4823,6 @@ This area does not allow pushing. You can't push others here unless you own <notification icon="notify.tga" name="NoVoice" - persist="true" type="notify"> This area has voice chat disabled. You won't be able to hear anyone talking. <unique/> @@ -5007,7 +4831,6 @@ This area has voice chat disabled. You won't be able to hear anyone talking <notification icon="notify.tga" name="NoBuild" - persist="true" type="notify"> This area has building disabled. You can't build or rez objects here. <unique/> @@ -5016,7 +4839,6 @@ This area has building disabled. You can't build or rez objects here. <notification icon="notify.tga" name="ScriptsStopped" - persist="true" type="notify"> An administrator has temporarily stopped scripts in this region. </notification> @@ -5024,7 +4846,6 @@ An administrator has temporarily stopped scripts in this region. <notification icon="notify.tga" name="ScriptsNotRunning" - persist="true" type="notify"> This region is not running any scripts. </notification> @@ -5032,7 +4853,6 @@ This region is not running any scripts. <notification icon="notify.tga" name="NoOutsideScripts" - persist="true" type="notify"> This land has outside scripts disabled. @@ -5042,7 +4862,6 @@ No scripts will work here except those belonging to the land owner. <notification icon="notify.tga" name="ClaimPublicLand" - persist="true" type="notify"> You can only claim public land in the Region you're in. </notification> @@ -5050,7 +4869,6 @@ You can only claim public land in the Region you're in. <notification icon="notify.tga" name="RegionTPAccessBlocked" - persist="true" type="notify"> You aren't allowed in that Region due to your maturity Rating. You may need to validate your age and/or install the latest Viewer. @@ -5060,7 +4878,6 @@ Please go to the Knowledge Base for details on accessing areas with this maturit <notification icon="notify.tga" name="URBannedFromRegion" - persist="true" type="notify"> You are banned from the region. </notification> @@ -5068,7 +4885,6 @@ You are banned from the region. <notification icon="notify.tga" name="NoTeenGridAccess" - persist="true" type="notify"> Your account cannot connect to this teen grid region. </notification> @@ -5076,7 +4892,6 @@ Your account cannot connect to this teen grid region. <notification icon="notify.tga" name="ImproperPaymentStatus" - persist="true" type="notify"> You do not have proper payment status to enter this region. </notification> @@ -5084,7 +4899,6 @@ You do not have proper payment status to enter this region. <notification icon="notify.tga" name="MustGetAgeRgion" - persist="true" type="notify"> You must be age-verified to enter this region. </notification> @@ -5092,7 +4906,6 @@ You must be age-verified to enter this region. <notification icon="notify.tga" name="MustGetAgeParcel" - persist="true" type="notify"> You must be age-verified to enter this parcel. </notification> @@ -5100,7 +4913,6 @@ You must be age-verified to enter this parcel. <notification icon="notify.tga" name="NoDestRegion" - persist="true" type="notify"> No destination region found. </notification> @@ -5108,7 +4920,6 @@ No destination region found. <notification icon="notify.tga" name="NotAllowedInDest" - persist="true" type="notify"> You are not allowed into the destination. </notification> @@ -5116,7 +4927,6 @@ You are not allowed into the destination. <notification icon="notify.tga" name="RegionParcelBan" - persist="true" type="notify"> Cannot region cross into banned parcel. Try another way. </notification> @@ -5124,7 +4934,6 @@ Cannot region cross into banned parcel. Try another way. <notification icon="notify.tga" name="TelehubRedirect" - persist="true" type="notify"> You have been redirected to a telehub. </notification> @@ -5132,7 +4941,6 @@ You have been redirected to a telehub. <notification icon="notify.tga" name="CouldntTPCloser" - persist="true" type="notify"> Could not teleport closer to destination. </notification> @@ -5140,7 +4948,6 @@ Could not teleport closer to destination. <notification icon="notify.tga" name="TPCancelled" - persist="true" type="notify"> Teleport cancelled. </notification> @@ -5148,7 +4955,6 @@ Teleport cancelled. <notification icon="notify.tga" name="FullRegionTryAgain" - persist="true" type="notify"> The region you are attempting to enter is currently full. Please try again in a few moments. @@ -5157,7 +4963,6 @@ Please try again in a few moments. <notification icon="notify.tga" name="GeneralFailure" - persist="true" type="notify"> General failure. </notification> @@ -5165,7 +4970,6 @@ General failure. <notification icon="notify.tga" name="RoutedWrongRegion" - persist="true" type="notify"> Routed to wrong region. Please try again. </notification> @@ -5173,7 +4977,6 @@ Routed to wrong region. Please try again. <notification icon="notify.tga" name="NoValidAgentID" - persist="true" type="notify"> No valid agent id. </notification> @@ -5181,7 +4984,6 @@ No valid agent id. <notification icon="notify.tga" name="NoValidSession" - persist="true" type="notify"> No valid session id. </notification> @@ -5189,7 +4991,6 @@ No valid session id. <notification icon="notify.tga" name="NoValidCircuit" - persist="true" type="notify"> No valid circuit code. </notification> @@ -5197,7 +4998,6 @@ No valid circuit code. <notification icon="notify.tga" name="NoValidTimestamp" - persist="true" type="notify"> No valid timestamp. </notification> @@ -5205,7 +5005,6 @@ No valid timestamp. <notification icon="notify.tga" name="NoPendingConnection" - persist="true" type="notify"> Unable to create pending connection. </notification> @@ -5213,7 +5012,6 @@ Unable to create pending connection. <notification icon="notify.tga" name="InternalUsherError" - persist="true" type="notify"> Internal error attempting to connect agent usher. </notification> @@ -5221,7 +5019,6 @@ Internal error attempting to connect agent usher. <notification icon="notify.tga" name="NoGoodTPDestination" - persist="true" type="notify"> Unable to find a good teleport destination in this region. </notification> @@ -5229,7 +5026,6 @@ Unable to find a good teleport destination in this region. <notification icon="notify.tga" name="InternalErrorRegionResolver" - persist="true" type="notify"> Internal error attempting to activate region resolver. </notification> @@ -5237,7 +5033,6 @@ Internal error attempting to activate region resolver. <notification icon="notify.tga" name="NoValidLanding" - persist="true" type="notify"> A valid landing point could not be found. </notification> @@ -5245,7 +5040,6 @@ A valid landing point could not be found. <notification icon="notify.tga" name="NoValidParcel" - persist="true" type="notify"> No valid parcel could be found. </notification> @@ -5274,6 +5068,28 @@ An object named [OBJECTFROMNAME] owned by [NAME_SLURL] has given you this [OBJEC <notification icon="notify.tga" + name="ObjectGiveItemUnknownUser" + type="offer"> +An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you this [OBJECTTYPE]: +[ITEM_SLURL] + <form name="form"> + <button + index="0" + name="Keep" + text="Keep"/> + <button + index="1" + name="Discard" + text="Discard"/> + <button + index="2" + name="Mute" + text="Block"/> + </form> + </notification> + + <notification + icon="notify.tga" name="UserGiveItem" type="offer"> [NAME_SLURL] has given you this [OBJECTTYPE]: @@ -5297,7 +5113,6 @@ An object named [OBJECTFROMNAME] owned by [NAME_SLURL] has given you this [OBJEC <notification icon="notify.tga" name="GodMessage" - persist="true" type="notify"> [NAME] @@ -5307,7 +5122,6 @@ An object named [OBJECTFROMNAME] owned by [NAME_SLURL] has given you this [OBJEC <notification icon="notify.tga" name="JoinGroup" - persist="true" type="notify"> [MESSAGE] <form name="form"> @@ -5332,7 +5146,7 @@ An object named [OBJECTFROMNAME] owned by [NAME_SLURL] has given you this [OBJEC type="offer"> [NAME_SLURL] has offered to teleport you to their location: -[MESSAGE] - [MATURITY_STR] <icon>[MATURITY_ICON]</icon> +[MESSAGE] <form name="form"> <button index="0" @@ -5356,7 +5170,6 @@ An object named [OBJECTFROMNAME] owned by [NAME_SLURL] has given you this [OBJEC <notification icon="notify.tga" name="GotoURL" - persist="true" type="notify"> [MESSAGE] [URL] @@ -5403,7 +5216,6 @@ An object named [OBJECTFROMNAME] owned by [NAME_SLURL] has given you this [OBJEC <notification icon="notify.tga" name="OfferFriendshipNoMessage" - persist="true" type="notify"> [NAME] is offering friendship. @@ -5430,7 +5242,6 @@ An object named [OBJECTFROMNAME] owned by [NAME_SLURL] has given you this [OBJEC <notification icon="notify.tga" name="FriendshipDeclined" - persist="true" type="notify"> [NAME] declined your friendship offer. </notification> @@ -5452,7 +5263,6 @@ Friendship offer declined. <notification icon="notify.tga" name="OfferCallingCard" - persist="true" type="notify"> [FIRST] [LAST] is offering their calling card. This will add a bookmark in your inventory so you can quickly IM this Resident. @@ -5473,7 +5283,6 @@ This will add a bookmark in your inventory so you can quickly IM this Resident. name="RegionRestartMinutes" priority="high" sound="UISndAlert" - persist="true" type="notify"> This region will restart in [MINUTES] minutes. If you stay in this region you will be logged out. @@ -5484,7 +5293,6 @@ If you stay in this region you will be logged out. name="RegionRestartSeconds" priority="high" sound="UISndAlert" - persist="true" type="notify"> This region will restart in [SECONDS] seconds. If you stay in this region you will be logged out. @@ -5514,7 +5322,6 @@ From object: [OBJECTNAME], owner: [NAME]? <notification icon="notify.tga" name="FailedToFindWearableUnnamed" - persist="true" type="notify"> Failed to find [TYPE] in database. </notification> @@ -5522,15 +5329,20 @@ Failed to find [TYPE] in database. <notification icon="notify.tga" name="FailedToFindWearable" - persist="true" type="notify"> Failed to find [TYPE] named [DESC] in database. </notification> <notification icon="notify.tga" + name="ShareToWebFailed" + type="notify"> + Failed to upload image to web. + </notification> + + <notification + icon="notify.tga" name="InvalidWearable" - persist="true" type="notify"> The item you are trying to wear uses a feature that your Viewer can't read. Please upgrade your version of [APP_NAME] to wear this item. </notification> @@ -5538,7 +5350,6 @@ The item you are trying to wear uses a feature that your Viewer can't read. <notification icon="notify.tga" name="ScriptQuestion" - persist="true" type="notify"> '[OBJECTNAME]', an object owned by '[NAME]', would like to: @@ -5564,7 +5375,6 @@ Is this OK? icon="notify.tga" name="ScriptQuestionCaution" priority="high" - persist="true" type="notify"> An object named '[OBJECTNAME]', owned by '[NAME]' would like to: @@ -5621,7 +5431,6 @@ Grant this request? <notification icon="notify.tga" name="FirstBalanceIncrease" - persist="true" type="notify"> You just received L$[AMOUNT]. Your L$ balance is shown in the upper-right. @@ -5630,7 +5439,6 @@ Your L$ balance is shown in the upper-right. <notification icon="notify.tga" name="FirstBalanceDecrease" - persist="true" type="notify"> You just paid L$[AMOUNT]. Your L$ balance is shown in the upper-right. @@ -5640,7 +5448,6 @@ Your L$ balance is shown in the upper-right. <notification icon="notify.tga" name="BuyLindenDollarSuccess" - persist="true" type="notify"> Thank you for your payment! @@ -5653,7 +5460,6 @@ The status of your payment can be checked on your Transaction History page on yo <notification icon="notify.tga" name="FirstSit" - persist="true" type="notify"> You are sitting. Use your arrow keys (or AWSD) to look around. @@ -5663,7 +5469,6 @@ Click the 'Stand Up' button to stand. <notification icon="notify.tga" name="FirstMap" - persist="true" type="notify"> Click and drag the map to look around. Double-click to teleport. @@ -5673,7 +5478,6 @@ Use the controls on the right to find things and display different backgrounds. <notification icon="notify.tga" name="FirstBuild" - persist="true" type="notify"> You have opened the Build Tools. Every object you see around you was created using these tools. </notification> @@ -5683,7 +5487,6 @@ You have opened the Build Tools. Every object you see around you was created usi <notification icon="notify.tga" name="FirstLeftClickNoHit" - persist="true" type="notify"> Left-clicking interacts with special objects. If the mouse pointer changes to a hand, you can interact with the object. @@ -5693,7 +5496,6 @@ You have opened the Build Tools. Every object you see around you was created usi <notification icon="notify.tga" name="FirstTeleport" - persist="true" type="notify"> You can only teleport to certain areas in this region. The arrow points to your specific destination. Click the arrow to dismiss it. </notification> @@ -5703,7 +5505,6 @@ You can only teleport to certain areas in this region. The arrow points to your <notification icon="notify.tga" name="FirstOverrideKeys" - persist="true" type="notify"> Your movement keys are now being handled by an object. Try the arrow keys or AWSD to see what they do. @@ -5715,7 +5516,6 @@ Press 'M' to do this. <notification icon="notify.tga" name="FirstAppearance" - persist="true" type="notify"> You are editing your Appearance. Use the arrow keys to look around. @@ -5725,7 +5525,6 @@ When you are done, press 'Save All'. <notification icon="notify.tga" name="FirstInventory" - persist="true" type="notify"> This is your Inventory, which contains items you own. @@ -5738,7 +5537,6 @@ This is your Inventory, which contains items you own. <notification icon="notify.tga" name="FirstSandbox" - persist="true" type="notify"> This is a sandbox area, and is meant to help Residents learn how to build. @@ -5749,7 +5547,6 @@ Things you build here will be deleted after you leave, so don't forget to r <notification icon="notify.tga" name="FirstFlexible" - persist="true" type="notify"> This object is flexible. Flexis must be phantom and not physical. </notification> @@ -5757,7 +5554,6 @@ This object is flexible. Flexis must be phantom and not physical. <notification icon="notify.tga" name="FirstDebugMenus" - persist="true" type="notify"> You opened the Advanced menu. @@ -5770,7 +5566,6 @@ To toggle this menu, <notification icon="notify.tga" name="FirstSculptedPrim" - persist="true" type="notify"> You are editing a Sculpted prim. Sculpties require a special texture to define their shape. </notification> @@ -5780,7 +5575,6 @@ You are editing a Sculpted prim. Sculpties require a special texture to define t <notification icon="notify.tga" name="FirstMedia" - persist="true" type="notify"> You have begun playing media. Media can set to play automatically in the preferences window under Audio / Video. Note that this can be a security risk for media sites you do not trust. </notification> @@ -5821,7 +5615,6 @@ Click Accept to join the call or Decline to decline the invitation. Click Block <notification icon="notify.tga" name="AutoUnmuteByIM" - persist="true" type="notify"> [FIRST] [LAST] was sent an instant message and has been automatically unblocked. </notification> @@ -5829,7 +5622,6 @@ Click Accept to join the call or Decline to decline the invitation. Click Block <notification icon="notify.tga" name="AutoUnmuteByMoney" - persist="true" type="notify"> [FIRST] [LAST] was given money and has been automatically unblocked. </notification> @@ -5837,7 +5629,6 @@ Click Accept to join the call or Decline to decline the invitation. Click Block <notification icon="notify.tga" name="AutoUnmuteByInventory" - persist="true" type="notify"> [FIRST] [LAST] was offered inventory and has been automatically unblocked. </notification> @@ -5996,50 +5787,6 @@ We are creating a voice channel for you. This may take up to one minute. </notification> <notification - icon="notify.tga" - name="VoiceEffectsExpired" - sound="UISndAlert" - persist="true" - type="notify"> -One or more of your subscribed Voice Morphs has expired. -[[URL] Click here] to renew your subscription. - <unique/> - </notification> - - <notification - icon="notify.tga" - name="VoiceEffectsExpiredInUse" - sound="UISndAlert" - persist="true" - type="notify"> -The active Voice Morph has expired, your normal voice settings have been applied. -[[URL] Click here] to renew your subscription. - <unique/> - </notification> - - <notification - icon="notify.tga" - name="VoiceEffectsWillExpire" - sound="UISndAlert" - persist="true" - type="notify"> -One or more of your Voice Morphs will expire in less than [INTERVAL] days. -[[URL] Click here] to renew your subscription. - <unique/> - </notification> - LLNotificationsUtil::add("VoiceEffectsNew"); - - <notification - icon="notify.tga" - name="VoiceEffectsNew" - sound="UISndAlert" - persist="true" - type="notify"> -New Voice Morphs are available! - <unique/> - </notification> - - <notification icon="notifytip.tga" name="Cannot enter parcel: not a group member" type="notifytip"> @@ -6195,194 +5942,6 @@ Selected button can not be shown right now. The button will be shown when there is enough space for it. </notification> - <notification - icon="notifytip.tga" - name="ShareNotification" - type="notifytip"> -Select residents to share with. - </notification> - <notification - icon="notifytip.tga" - name="ShareItemsConfirmation" - type="alertmodal"> -Are you sure you want to share the following items: - -[ITEMS] - -With the following Residents: - -[RESIDENTS] - <usetemplate - name="okcancelbuttons" - notext="Cancel" - yestext="Ok"/> - </notification> - <notification - icon="notifytip.tga" - name="ItemsShared" - type="notifytip"> -Items successfully shared. - </notification> - <notification - icon="notifytip.tga" - name="DeedToGroupFail" - type="notifytip"> -Deed to group failed. - </notification> - - <notification - icon="notifytip.tga" - name="AvatarRezNotification" - type="notifytip"> -( [EXISTENCE] seconds alive ) -Avatar '[NAME]' declouded after [TIME] seconds. - </notification> - - <notification - icon="notifytip.tga" - name="AvatarRezSelfBakedDoneNotification" - type="notifytip"> -( [EXISTENCE] seconds alive ) -You finished baking your outfit after [TIME] seconds. - </notification> - - <notification - icon="notifytip.tga" - name="AvatarRezSelfBakedUpdateNotification" - type="notifytip"> -( [EXISTENCE] seconds alive ) -You sent out an update of your appearance after [TIME] seconds. -[STATUS] - </notification> - - - <notification - icon="notifytip.tga" - name="AvatarRezCloudNotification" - type="notifytip"> -( [EXISTENCE] seconds alive ) -Avatar '[NAME]' became cloud. - </notification> - - <notification - icon="notifytip.tga" - name="AvatarRezArrivedNotification" - type="notifytip"> -( [EXISTENCE] seconds alive ) -Avatar '[NAME]' appeared. - </notification> - - <notification - icon="notifytip.tga" - name="AvatarRezLeftCloudNotification" - type="notifytip"> -( [EXISTENCE] seconds alive ) -Avatar '[NAME]' left after [TIME] seconds as cloud. - </notification> - - <notification - icon="notifytip.tga" - name="AvatarRezEnteredAppearanceNotification" - type="notifytip"> -( [EXISTENCE] seconds alive ) -Avatar '[NAME]' entered appearance mode. - </notification> - - <notification - icon="notifytip.tga" - name="AvatarRezLeftAppearanceNotification" - type="notifytip"> -( [EXISTENCE] seconds alive ) -Avatar '[NAME]' left appearance mode. - </notification> - - <notification - icon="alertmodal.tga" - name="NoConnect" - type="alertmodal"> -We're having trouble connecting using [PROTOCOL] [HOSTID]. -Please check your network and firewall setup. - <form name="form"> - <button - default="true" - index="0" - name="OK" - text="OK"/> - </form> - </notification> - - <notification - icon="alertmodal.tga" - name="NoVoiceConnect" - type="alertmodal"> -We're having trouble connecting to your voice server: - -[HOSTID] - -Voice communications will not be available. -Please check your network and firewall setup. - <form name="form"> - <button - default="true" - index="0" - name="OK" - text="OK"/> - </form> - </notification> - - <notification - icon="notifytip.tga" - name="AvatarRezLeftNotification" - type="notifytip"> -( [EXISTENCE] seconds alive ) -Avatar '[NAME]' left as fully loaded. - </notification> - - <notification - icon="notifytip.tga" - name="AvatarRezSelfBakedTextureUploadNotification" - type="notifytip"> -( [EXISTENCE] seconds alive ) -You uploaded a [RESOLUTION] baked texture for '[BODYREGION]' after [TIME] seconds. - </notification> - - <notification - icon="notifytip.tga" - name="AvatarRezSelfBakedTextureUpdateNotification" - type="notifytip"> -( [EXISTENCE] seconds alive ) -You locally updated a [RESOLUTION] baked texture for '[BODYREGION]' after [TIME] seconds. - </notification> - - <notification - icon="alertmodal.tga" - name="ConfirmLeaveCall" - type="alert"> -Are you sure you want to leave this call? - <usetemplate - ignoretext="Confirm before I leave call" - name="okcancelignore" - notext="No" - yestext="Yes"/> - <unique/> - </notification> - - <notification - icon="alertmodal.tga" - name="ConfirmMuteAll" - type="alert"> -You have selected to mute all participants in a group call. -This will also cause all residents that later join the call to be -muted, even after you have left the call. - -Mute everyone? - <usetemplate - ignoretext="Confirm before I mute all participants in a group call" - name="okcancelignore" - yestext="Ok" - notext="Cancel"/> - <unique/> - </notification> <global name="UnsupportedCPU"> - Your CPU speed does not meet the minimum requirements. @@ -6410,14 +5969,11 @@ If you continue to have problems, please visit the [SUPPORT_SITE]. - Your system memory does not meet the minimum requirements. </global> -<!-- these are alert strings from server. the name needs to match entire the server string, and needs to be changed +<!-- this is alert string from server. the name needs to match entire the server string, and needs to be changed whenever the server string changes --> <global name="You can only set your 'Home Location' on your land or at a mainland Infohub."> If you own a piece of land, you can make it your home location. Otherwise, you can look at the Map and find places marked "Infohub". </global> - <global name="You died and have been teleported to your home location"> -You died and have been teleported to your home location. - </global> </notifications> diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index 4b622691b3..c34a367c32 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -1,401 +1,320 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel + mouse_opaque="true" background_visible="true" bg_alpha_color="DkGray" bg_opaque_color="DkGray" - chrome="true" follows="left|bottom|right" height="33" layout="topleft" left="0" name="bottom_tray" top="28" - width="1310"> - <string - name="SpeakBtnToolTip" - value="Turns microphone on/off" /> - <string - name="VoiceControlBtnToolTip" - value="Shows/hides voice control panel" /> + chrome="true" + border_visible="false" + width="1000"> + <string name="SpeakBtnToolTip">Turns microphone on/off</string> + <string name="VoiceControlBtnToolTip">Shows/hides voice control panel</string> <layout_stack + mouse_opaque="false" border_size="0" clip="false" follows="all" height="28" layout="topleft" left="0" - mouse_opaque="false" name="toolbar_stack" orientation="horizontal" top="0" - width="1310"> + width="1000"> <icon auto_resize="false" follows="left|right" height="10" image_name="spacer24.tga" layout="topleft" - left="0" min_width="2" + left="0" top="0" width="2" /> <layout_panel + mouse_opaque="false" auto_resize="false" - filename="panel_nearby_chat_bar.xml" follows="left|right" height="28" layout="topleft" left="0" - max_width="320" min_height="23" - min_width="214" - mouse_opaque="false" - name="chat_bar" + width="310" top="4" - user_resize="true" - width="308" /> - <!-- - There is resize bar between chatbar and Speak button. It has 2px width (is is set as 2*UIResizeBarOverlap) - --> + max_width="320" + min_width="216" + name="chat_bar" + user_resize="false" + filename="panel_nearby_chat_bar.xml" /> <layout_panel + mouse_opaque="false" auto_resize="false" follows="right" height="28" layout="topleft" min_height="28" - min_width="59" - mouse_opaque="false" - name="speak_panel" + width="105" top_delta="0" - user_resize="true" - width="110"> - <talk_button - follows="left|right" - height="23" - layout="topleft" - left="2" - name="talk" - top="5" - width="105"> - <show_button - tab_stop="true"> - <init_callback - function="Button.SetDockableFloaterToggle" - parameter="voice_controls" /> - </show_button> - <!-- 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" - label="Speak" - label_selected="Speak" - name="speak_btn" - pad_right="20" - tab_stop="true" - use_ellipses="true" /> - </talk_button> + min_width="54" + name="speak_panel" + user_resize="false"> + <talk_button + follows="left|right" + height="23" + speak_button.tab_stop="true" + show_button.tab_stop="true" + layout="topleft" + left="0" + 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="center" + name="speak_btn" + label="Speak" + label_selected="Speak" + pad_right="22" + use_ellipses="true" + /> + <show_button> + <show_button.init_callback + function="Button.SetDockableFloaterToggle" + parameter="voice_controls" /> + </show_button> + </talk_button> </layout_panel> + <icon + auto_resize="false" + follows="left|right" + height="10" + image_name="spacer24.tga" + layout="topleft" + left="0" + name="after_speak_panel" + min_width="3" + top="0" + width="3"/> <layout_panel + mouse_opaque="false" auto_resize="false" follows="right" height="28" layout="topleft" min_height="28" - min_width="65" - mouse_opaque="false" - name="gesture_panel" + width="82" top_delta="0" - user_resize="false" - width="85"> - <gesture_combo_list - follows="left|right" - height="23" - label="Gesture" - layout="topleft" - left="0" - name="Gesture" - tool_tip="Shows/hides gestures" - top="5" - width="82"> - <combo_button - pad_right="10" - use_ellipses="true" /> - <combo_list - page_lines="17" /> - </gesture_combo_list> + min_width="62" + name="gesture_panel" + user_resize="false"> + <gesture_combo_list + follows="left|right" + height="23" + label="Gesture" + layout="topleft" + name="Gesture" + left="0" + top="5" + width="82" + tool_tip="Shows/hides gestures"> + <gesture_combo_list.combo_button + pad_right="10" + use_ellipses="true" /> + </gesture_combo_list> </layout_panel> + <icon + auto_resize="false" + color="0 0 0 0" + follows="left|right" + height="10" + image_name="spacer24.tga" + layout="topleft" + left="0" + min_width="3" + name="after_gesture_panel" + top="0" + width="3"/> <layout_panel + mouse_opaque="false" auto_resize="false" follows="right" height="28" layout="topleft" min_height="28" - min_width="52" - mouse_opaque="false" name="movement_panel" user_resize="false" - width="83"> + width="80" + min_width="49"> <button + image_selected="PushButton_Selected_Press" + image_pressed="PushButton_Press" + image_pressed_selected="PushButton_Selected_Press" follows="left|right" height="23" - image_pressed="PushButton_Press" - image_pressed_selected="PushButton_Selected_Press" - image_selected="PushButton_Selected_Press" + use_ellipses="true" is_toggle="true" label="Move" layout="topleft" name="movement_btn" tool_tip="Shows/hides movement controls" top="5" - use_ellipses="true" width="80"> - <init_callback + <button.init_callback function="Button.SetDockableFloaterToggle" parameter="moveview" /> </button> </layout_panel> + <icon + auto_resize="false" + color="0 0 0 0" + follows="left|right" + height="10" + image_name="spacer24.tga" + layout="topleft" + left="0" + min_width="3" + name="after_movement_panel" + top="0" + width="3"/> <layout_panel + mouse_opaque="false" auto_resize="false" follows="left|right" height="28" layout="topleft" min_height="28" - min_width="52" - mouse_opaque="false" + min_width="49" name="cam_panel" user_resize="false" - width="83"> + width="80"> <button + image_selected="PushButton_Selected_Press" + image_pressed="PushButton_Press" + image_pressed_selected="PushButton_Selected_Press" follows="left|right" height="23" - image_pressed="PushButton_Press" - image_pressed_selected="PushButton_Selected_Press" - image_selected="PushButton_Selected_Press" + use_ellipses="true" is_toggle="true" label="View" layout="topleft" left="0" - name="camera_btn" tool_tip="Shows/hides camera controls" top="5" - use_ellipses="true" + name="camera_btn" width="80"> - <init_callback + <button.init_callback function="Button.SetDockableFloaterToggle" parameter="camera" /> </button> </layout_panel> - <layout_panel + <icon auto_resize="false" + color="0 0 0 0" follows="left|right" - height="28" + height="10" + image_name="spacer24.tga" layout="topleft" - min_width="40" - mouse_opaque="false" - name="snapshot_panel" - user_resize="false" - width="39"> - <button - follows="left|right" - height="23" - image_overlay="Snapshot_Off" - image_pressed="PushButton_Press" - image_pressed_selected="PushButton_Selected_Press" - image_selected="PushButton_Selected_Press" - is_toggle="true" - layout="topleft" - left="0" - name="snapshots" - tool_tip="Take snapshot" - top="5" - width="36"> - <init_callback - function="Button.SetFloaterToggle" - parameter="snapshot" /> - </button> - </layout_panel> + left="0" + min_width="3" + name="after_cam_panel" + top="0" + width="3"/> <layout_panel - auto_resize="false" - follows="left|right" - height="28" - layout="topleft" - min_height="28" - min_width="52" mouse_opaque="false" - name="build_btn_panel" - user_resize="false" - width="83"> -<!--*FIX: Build Floater is not opened with default registration. Will be fixed soon. -Disabled for now. ---> - <button - follows="left|right" - height="23" - image_pressed="PushButton_Press" - image_pressed_selected="PushButton_Selected_Press" - image_selected="PushButton_Selected_Press" - is_toggle="true" - label="Build" - layout="topleft" - left="0" - name="build_btn" - tool_tip="Shows/hides Build Tools" - top="5" - use_ellipses="true" - width="80"> - <commit_callback - function="Build.Toggle" - parameter="build" /> - </button> - </layout_panel> - <layout_panel auto_resize="false" follows="left|right" height="28" layout="topleft" - min_height="28" - min_width="52" - mouse_opaque="false" - name="search_btn_panel" - user_resize="false" - width="83"> + min_width="40" + name="snapshot_panel" + width="40"> <button - follows="left|right" + follows="left|right" height="23" - image_pressed="PushButton_Press" - image_pressed_selected="PushButton_Selected_Press" image_selected="PushButton_Selected_Press" - is_toggle="true" - label="Search" - layout="topleft" - left="0" - name="search_btn" - tool_tip="Shows/hides Search" - top="5" - use_ellipses="true" - width="80"> - <init_callback - function="Button.SetFloaterToggle" - parameter="search" /> - </button> - </layout_panel> - <layout_panel - auto_resize="false" - follows="left|right" - height="28" - layout="topleft" - min_height="28" - min_width="52" - mouse_opaque="false" - name="world_map_btn_panel" - user_resize="false" - width="83"> - <button - follows="left|right" - height="23" image_pressed="PushButton_Press" image_pressed_selected="PushButton_Selected_Press" - image_selected="PushButton_Selected_Press" - is_toggle="true" - label="Map" - layout="topleft" left="0" - name="world_map_btn" - tool_tip="Shows/hides World Map" - top="5" - use_ellipses="true" - width="80"> - <init_callback - function="Button.SetFloaterToggle" - parameter="world_map" /> - </button> - </layout_panel> - <layout_panel - auto_resize="false" - follows="left|right" - height="28" - layout="topleft" - min_height="28" - min_width="52" - mouse_opaque="false" - name="mini_map_btn_panel" - user_resize="false" - width="83"> - <button - follows="left|right" - height="23" - image_pressed="PushButton_Press" - image_pressed_selected="PushButton_Selected_Press" - image_selected="PushButton_Selected_Press" - is_toggle="true" - label="Mini-Map" + label="" layout="topleft" - left="0" - name="mini_map_btn" - tool_tip="Shows/hides Mini-Map" + name="snapshots" + width="36" top="5" - use_ellipses="true" - width="80"> - <init_callback - function="Button.SetFloaterToggle" - parameter="mini_map" /> - </button> - </layout_panel> + is_toggle="true" + image_overlay="Snapshot_Off" + tool_tip="Take snapshot"> + <button.init_callback + function="Button.SetFloaterToggle" + parameter="snapshot" /> + </button> + </layout_panel> <layout_panel + mouse_opaque="false" follows="left|right" height="30" layout="topleft" - min_width="95" - mouse_opaque="false" - name="chiclet_list_panel" top="0" + name="chiclet_list_panel" + width="189" + min_width="95" user_resize="false" - width="189"> + auto_resize="true"> <!--*NOTE: min_width of the chiclet_panel (chiclet_list) must be the same as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly. EXT-991--> <chiclet_panel - chiclet_padding="4" + mouse_opaque="false" follows="left|right" height="24" layout="topleft" left="1" min_width="95" - mouse_opaque="false" name="chiclet_list" top="7" + chiclet_padding="4" + scrolling_offset="40" width="189"> <button auto_resize="true" follows="right" height="29" - image_hover_selected="SegmentedBtn_Left_Over" - image_hover_unselected="SegmentedBtn_Left_Over" - image_overlay="Arrow_Small_Left" - image_pressed="SegmentedBtn_Left_Press" - image_pressed_selected="SegmentedBtn_Left_Press" image_selected="SegmentedBtn_Left_Off" image_unselected="SegmentedBtn_Left_Off" + image_hover_selected="SegmentedBtn_Left_Over" + image_hover_unselected="SegmentedBtn_Left_Over" + image_pressed="SegmentedBtn_Left_Press" + image_pressed_selected="SegmentedBtn_Left_Press" + image_overlay="Arrow_Small_Left" layout="topleft" name="chicklet_left_scroll_button" + scale_image="true" tab_stop="false" - top="-28" + top="-4" + right_pad="2" visible="false" width="7" /> <button auto_resize="true" follows="right" height="29" - image_hover_selected="SegmentedBtn_Right_Over" - image_hover_unselected="SegmentedBtn_Right_Over" - image_overlay="Arrow_Small_Right" - image_pressed="SegmentedBtn_Right_Press" - image_pressed_selected="SegmentedBtn_Right_Press" image_selected="SegmentedBtn_Right_Off" image_unselected="SegmentedBtn_Right_Off" + image_hover_selected="SegmentedBtn_Right_Over" + image_hover_unselected="SegmentedBtn_Right_Over" + image_pressed="SegmentedBtn_Right_Press" + image_pressed_selected="SegmentedBtn_Right_Press" + image_overlay="Arrow_Small_Right" layout="topleft" name="chicklet_right_scroll_button" + scale_image="true" tab_stop="false" - top="-28" + top="-4" visible="false" width="7" /> </chiclet_panel> @@ -411,24 +330,25 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly. min_width="4" name="DUMMY" top="0" - width="4" /> + width="4"/> <layout_panel auto_resize="false" follows="right" height="28" layout="topleft" min_height="28" - min_width="37" - name="im_well_panel" top="0" - user_resize="false" - width="37"> + name="im_well_panel" + width="37" + min_width="37" + user_resize="false"> <chiclet_im_well + max_displayed_count="99" + flash_period="0.3" follows="right" height="28" layout="topleft" left="0" - max_displayed_count="99" name="im_well" top="0" width="35"> @@ -454,8 +374,8 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well left="0" name="Unread IM messages" tool_tip="Conversations" - width="34"> - <init_callback + width="34" > + <button.init_callback function="Button.SetDockableFloaterToggle" parameter="im_well_window" /> </button> @@ -467,12 +387,13 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well height="28" layout="topleft" min_height="28" - min_width="37" - name="notification_well_panel" top="0" - user_resize="false" - width="37"> + name="notification_well_panel" + width="37" + min_width="37" + user_resize="false"> <chiclet_notification + flash_period="0.25" follows="right" height="23" layout="topleft" @@ -481,39 +402,27 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well name="notification_well" top="5" width="35"> - <button - auto_resize="true" + <button bottom_pad="3" - follows="right" - halign="center" - height="23" - image_overlay="Notices_Unread" - image_overlay_alignment="center" image_pressed="WellButton_Lit" image_pressed_selected="WellButton_Lit_Selected" image_selected="PushButton_Press" - label_color="Black" - left="0" - name="Unread" - tool_tip="Notifications" - width="34"> - <init_callback - function="Button.SetDockableFloaterToggle" - parameter="notification_well_window" /> - </button> - </chiclet_notification> + auto_resize="true" + halign="center" + height="23" + follows="right" + label_color="Black" + left="0" + name="Unread" + image_overlay="Notices_Unread" + image_overlay_alignment="center" + tool_tip="Notifications" + width="34" > + <button.init_callback + function="Button.SetDockableFloaterToggle" + parameter="notification_well_window" /> + </button> + </chiclet_notification> </layout_panel> - <icon - auto_resize="false" - color="0 0 0 0" - follows="left|right" - height="10" - image_name="spacer24.tga" - layout="topleft" - left="0" - min_width="4" - name="DUMMY2" - top="0" - width="8" /> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml index e390b9e836..af3315ebfe 100644 --- a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml @@ -33,7 +33,7 @@ <texture_picker allow_no_texture="true" border_enabled="true" - fallback_image="default_land_picture.j2c" + default_image_name="TabIcon_Places_Large" enabled="false" follows="left|top" height="80" diff --git a/indra/newview/skins/default/xui/en/panel_edit_alpha.xml b/indra/newview/skins/default/xui/en/panel_edit_alpha.xml index 7bcd4962d2..1d0c0a02b0 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_alpha.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_alpha.xml @@ -21,131 +21,111 @@ name="avatar_alpha_color_panel" top="0" width="313" > - <check_box - control_name="LowerAlphaTextureInvisible" - follows="left" - height="16" - layout="topleft" - left="5" - name="lower alpha texture invisible" - top="10" - width="16" /> <texture_picker can_apply_immediately="true" default_image_name="Default" follows="left|top" - height="115" + height="100" label="Lower Alpha" layout="topleft" - left_pad="5" + left="30" name="Lower Alpha" tool_tip="Click to choose a picture" top="10" - width="115" > - <texture_picker.commit_callback - function="TexturePicker.Commit" /> - </texture_picker> - + width="94" /> <check_box - control_name="UpperAlphaTextureInvisible" + control_name="LowerAlphaTextureInvisible" follows="left" height="16" layout="topleft" - left_pad="20" - name="upper alpha texture invisible" - top="10" + left_pad="6" + name="lower alpha texture invisible" + top_delta="4" width="16" /> <texture_picker can_apply_immediately="true" default_image_name="Default" follows="left|top" - height="115" + height="100" label="Upper Alpha" layout="topleft" - left_pad="5" + left_pad="20" name="Upper Alpha" tool_tip="Click to choose a picture" top="10" - width="115"> - <texture_picker.commit_callback - function="TexturePicker.Commit" /> - </texture_picker> - + width="94" /> <check_box - control_name="HeadAlphaTextureInvisible" + control_name="UpperAlphaTextureInvisible" follows="left" height="16" layout="topleft" - left="5" - name="head alpha texture invisible" - top_pad="15" + left_pad="6" + name="upper alpha texture invisible" + top_delta="4" width="16" /> <texture_picker can_apply_immediately="true" default_image_name="Default" follows="left|top" - height="115" + height="100" label="Head Alpha" layout="topleft" - left_pad="5" + left="30" name="Head Alpha" tool_tip="Click to choose a picture" - top_delta="0" - width="115" > - <texture_picker.commit_callback - function="TexturePicker.Commit" /> - </texture_picker> - + top="120" + width="94" /> <check_box - control_name="Eye AlphaTextureInvisible" + control_name="HeadAlphaTextureInvisible" follows="left" height="16" layout="topleft" - left_pad="20" - name="eye alpha texture invisible" - top_delta="0" + left_pad="6" + name="head alpha texture invisible" + top_delta="4" width="16" /> <texture_picker can_apply_immediately="true" default_image_name="Default" follows="left|top" - height="115" + height="100" label="Eye Alpha" layout="topleft" - left_pad="5" + left_pad="20" name="Eye Alpha" tool_tip="Click to choose a picture" - top_delta="0" - width="115" > - <texture_picker.commit_callback - function="TexturePicker.Commit" /> - </texture_picker> - + top="120" + width="94" /> <check_box - control_name="HairAlphaTextureInvisible" + control_name="Eye AlphaTextureInvisible" follows="left" height="16" layout="topleft" - left="5" - name="hair alpha texture invisible" - top_pad="15" + left_pad="6" + name="eye alpha texture invisible" + top_delta="4" width="16" /> <texture_picker can_apply_immediately="true" default_image_name="Default" follows="left|top" - height="115" + height="100" label="Hair Alpha" layout="topleft" left="30" name="Hair Alpha" tool_tip="Click to choose a picture" - top_delta="0" - width="115" > - <texture_picker.commit_callback - function="TexturePicker.Commit" /> - </texture_picker> - + top="230" + width="94" /> + <check_box + control_name="HairAlphaTextureInvisible" + follows="left" + height="16" + layout="topleft" + left_pad="6" + name="hair alpha texture invisible" + top_delta="4" + width="16" /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_edit_eyes.xml b/indra/newview/skins/default/xui/en/panel_edit_eyes.xml index f173a2f3cb..f11ef43c76 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_eyes.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_eyes.xml @@ -32,11 +32,8 @@ name="Iris" tool_tip="Click to choose a picture" top="10" - width="64" > - <texture_picker.commit_callback - function="TexturePicker.Commit" /> - </texture_picker> - </panel> + width="64" /> + </panel> <panel border="false" bg_alpha_color="DkGray2" @@ -51,7 +48,6 @@ top_pad="10" width="313"> <accordion - fit_parent="true" follows="all" height ="300" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_edit_gloves.xml b/indra/newview/skins/default/xui/en/panel_edit_gloves.xml index a490f27b9f..7d8eed5085 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_gloves.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_gloves.xml @@ -32,10 +32,7 @@ name="Fabric" tool_tip="Click to choose a picture" top="10" - width="64" > - <texture_picker.commit_callback - function="TexturePicker.Commit" /> - </texture_picker> + width="64" /> <color_swatch can_apply_immediately="true" follows="left|top" @@ -46,12 +43,9 @@ name="Color/Tint" tool_tip="Click to open color picker" top="10" - width="64" > - <color_swatch.commit_callback - function="ColorSwatch.Commit" /> - </color_swatch> - </panel> - <panel + width="64" /> + </panel> + <panel border="false" bg_alpha_color="DkGray2" bg_opaque_color="DkGray2" @@ -65,7 +59,6 @@ top_pad="10" width="313"> <accordion - fit_parent="true" follows="all" height ="300" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_edit_hair.xml b/indra/newview/skins/default/xui/en/panel_edit_hair.xml index 6bb5d2fa9b..cd81aa2c4f 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_hair.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_hair.xml @@ -32,11 +32,8 @@ name="Texture" tool_tip="Click to choose a picture" top="10" - width="64" > - <texture_picker.commit_callback - function="TexturePicker.Commit" /> - </texture_picker> - </panel> + width="64" /> + </panel> <panel border="false" bg_alpha_color="DkGray2" @@ -51,7 +48,6 @@ top_pad="10" width="313"> <accordion - fit_parent="true" follows="all" height ="300" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_edit_jacket.xml b/indra/newview/skins/default/xui/en/panel_edit_jacket.xml index 929cdffb3d..ba03865937 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_jacket.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_jacket.xml @@ -32,10 +32,7 @@ name="Upper Fabric" tool_tip="Click to choose a picture" top="10" - width="74" > - <texture_picker.commit_callback - function="TexturePicker.Commit" /> - </texture_picker> + width="74" /> <texture_picker can_apply_immediately="true" default_image_name="Default" @@ -47,10 +44,7 @@ name="Lower Fabric" tool_tip="Click to choose a picture" top="10" - width="74" > - <texture_picker.commit_callback - function="TexturePicker.Commit" /> - </texture_picker> + width="74" /> <color_swatch can_apply_immediately="true" follows="left|top" @@ -61,10 +55,7 @@ name="Color/Tint" tool_tip="Click to open color picker" top="10" - width="74" > - <color_swatch.commit_callback - function="ColorSwatch.Commit" /> - </color_swatch> + width="74" /> </panel> <panel border="false" @@ -80,7 +71,6 @@ top_pad="10" width="313"> <accordion - fit_parent="true" follows="all" height ="300" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_edit_pants.xml b/indra/newview/skins/default/xui/en/panel_edit_pants.xml index f22cf983aa..5b02d1f968 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_pants.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_pants.xml @@ -32,10 +32,7 @@ name="Fabric" tool_tip="Click to choose a picture" top="10" - width="64" > - <texture_picker.commit_callback - function="TexturePicker.Commit" /> - </texture_picker> + width="64" /> <color_swatch can_apply_immediately="true" follows="left|top" @@ -46,10 +43,7 @@ name="Color/Tint" tool_tip="Click to open color picker" top="10" - width="64" > - <color_swatch.commit_callback - function="ColorSwatch.Commit" /> - </color_swatch> + width="64" /> </panel> <panel border="false" @@ -65,7 +59,6 @@ top_pad="10" width="313"> <accordion - fit_parent="true" follows="all" height ="300" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_edit_shape.xml b/indra/newview/skins/default/xui/en/panel_edit_shape.xml index d295f5fe4a..e1c574001a 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_shape.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_shape.xml @@ -8,22 +8,54 @@ name="edit_shape_panel" top_pad="10" width="333" > - <string name="meters">Meters</string> - <string name="feet">Feet</string> - <string name="height">Height:</string> - <string name="heigth_label_color" translate="false">White_50</string> - <string name="heigth_value_label_color" translate="false">White</string> - <text - follows="top|left|right" - font="SansSerifSmallBold" - halign="right" - height="12" - layout="topleft" - left="0" - name="avatar_height" - top="0" - width="310"> - </text> + <panel + border="false" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" + background_visible="true" + background_opaque="true" + follows="top|left|right" + height="50" + left="10" + layout="topleft" + name="avatar_sex_panel" + top="0" + width="313" > + <text + follows="top|left" + height="16" + layout="topleft" + left="10" + name="gender_text" + width="313"> + Gender: + </text> + <radio_group + follows="left|top|right" + left="10" + height="28" + layout="topleft" + name="sex_radio" + top_pad="3" + width="303" > + <radio_item + follows="all" + height="16" + label="Female" + layout="topleft" + left="10" + name="radio" + width="82" /> + <radio_item + follows="all" + height="16" + label="Male" + layout="topleft" + left_pad="10" + name="radio2" + width="82" /> + </radio_group> + </panel> <panel border="false" bg_alpha_color="DkGray2" @@ -31,22 +63,22 @@ background_visible="true" background_opaque="true" follows="all" - height="388" + height="345" label="Shirt" layout="topleft" left="10" name="accordion_panel" - top_pad="0" + top_pad="10" width="313"> <accordion layout="topleft" follows="all" - height ="388" + height ="345" left="0" name="wearable_accordion" top="0" single_expansion="true" - fit_parent="true" + fit_parent="false" width="313"> <accordion_tab layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_edit_shirt.xml b/indra/newview/skins/default/xui/en/panel_edit_shirt.xml index 85823073b5..7da8de4c0b 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_shirt.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_shirt.xml @@ -32,10 +32,7 @@ name="Fabric" tool_tip="Click to choose a picture" top="10" - width="64" > - <texture_picker.commit_callback - function="TexturePicker.Commit" /> - </texture_picker> + width="64" /> <color_swatch can_apply_immediately="true" follows="left|top" @@ -46,10 +43,7 @@ name="Color/Tint" tool_tip="Click to open color picker" top="10" - width="64" > - <color_swatch.commit_callback - function="ColorSwatch.Commit" /> - </color_swatch> + width="64" /> </panel> <panel border="false" @@ -65,7 +59,6 @@ top_pad="10" width="313"> <accordion - fit_parent="true" follows="all" height ="300" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_edit_shoes.xml b/indra/newview/skins/default/xui/en/panel_edit_shoes.xml index b26fde68f1..84fe26f7f6 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_shoes.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_shoes.xml @@ -32,10 +32,7 @@ name="Fabric" tool_tip="Click to choose a picture" top="10" - width="64" > - <texture_picker.commit_callback - function="TexturePicker.Commit" /> - </texture_picker> + width="64" /> <color_swatch can_apply_immediately="true" follows="left|top" @@ -46,10 +43,7 @@ name="Color/Tint" tool_tip="Click to open color picker" top="10" - width="64" > - <color_swatch.commit_callback - function="ColorSwatch.Commit" /> - </color_swatch> + width="64" /> </panel> <panel border="false" @@ -65,7 +59,6 @@ top_pad="10" width="313"> <accordion - fit_parent="true" follows="all" height ="300" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_edit_skin.xml b/indra/newview/skins/default/xui/en/panel_edit_skin.xml index 45591ba2ad..b5c8c95473 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_skin.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_skin.xml @@ -33,10 +33,7 @@ name="Head Tattoos" tool_tip="Click to choose a picture" top="10" - width="74" > - <texture_picker.commit_callback - function="TexturePicker.Commit" /> - </texture_picker> + width="74" /> <texture_picker allow_no_texture="true" can_apply_immediately="true" @@ -49,10 +46,7 @@ name="Upper Tattoos" tool_tip="Click to choose a picture" top="10" - width="74" > - <texture_picker.commit_callback - function="TexturePicker.Commit" /> - </texture_picker> + width="74" /> <texture_picker allow_no_texture="true" can_apply_immediately="true" @@ -65,11 +59,8 @@ name="Lower Tattoos" tool_tip="Click to choose a picture" top="10" - width="74" > - <texture_picker.commit_callback - function="TexturePicker.Commit" /> - </texture_picker> - </panel> + width="74" /> + </panel> <panel border="false" bg_alpha_color="DkGray2" @@ -85,7 +76,6 @@ width="313"> <accordion layout="topleft" - fit_parent="true" follows="all" height ="300" left="0" diff --git a/indra/newview/skins/default/xui/en/panel_edit_skirt.xml b/indra/newview/skins/default/xui/en/panel_edit_skirt.xml index bb8e0dca07..16f6950bd5 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_skirt.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_skirt.xml @@ -32,10 +32,7 @@ name="Fabric" tool_tip="Click to choose a picture" top="10" - width="64" > - <texture_picker.commit_callback - function="TexturePicker.Commit" /> - </texture_picker> + width="64" /> <color_swatch can_apply_immediately="true" follows="left|top" @@ -46,10 +43,7 @@ name="Color/Tint" tool_tip="Click to open color picker" top="10" - width="64" > - <color_swatch.commit_callback - function="ColorSwatch.Commit" /> - </color_swatch> + width="64" /> </panel> <panel border="false" @@ -65,7 +59,6 @@ top_pad="10" width="313"> <accordion - fit_parent="true" follows="all" height ="300" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_edit_socks.xml b/indra/newview/skins/default/xui/en/panel_edit_socks.xml index d813d94d93..e4f916703b 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_socks.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_socks.xml @@ -32,10 +32,7 @@ name="Fabric" tool_tip="Click to choose a picture" top="10" - width="64" > - <texture_picker.commit_callback - function="TexturePicker.Commit" /> - </texture_picker> + width="64" /> <color_swatch can_apply_immediately="true" follows="left|top" @@ -46,10 +43,7 @@ name="Color/Tint" tool_tip="Click to open color picker" top="10" - width="64" > - <color_swatch.commit_callback - function="ColorSwatch.Commit" /> - </color_swatch> + width="64" /> </panel> <panel border="false" @@ -65,7 +59,6 @@ top_pad="10" width="313"> <accordion - fit_parent="true" follows="all" height ="300" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml index 23a08344ea..ed990eb095 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml @@ -25,61 +25,38 @@ can_apply_immediately="true" default_image_name="Default" follows="left|top" - height="115" + height="100" label="Head Tattoo" layout="topleft" - left="20" + left="30" name="Head Tattoo" tool_tip="Click to choose a picture" top="10" - width="115" > - <texture_picker.commit_callback - function="TexturePicker.Commit" /> - </texture_picker> + width="94" /> <texture_picker can_apply_immediately="true" default_image_name="Default" follows="left|top" - height="115" + height="100" label="Upper Tattoo" layout="topleft" left_pad="30" name="Upper Tattoo" tool_tip="Click to choose a picture" top="10" - width="115" > - <texture_picker.commit_callback - function="TexturePicker.Commit" /> - </texture_picker> + width="94" /> <texture_picker can_apply_immediately="true" default_image_name="Default" follows="left|top" - height="115" + height="100" label="Lower Tattoo" layout="topleft" - left="20" + left="30" name="Lower Tattoo" tool_tip="Click to choose a picture" top_pad="10" - width="115" > - <texture_picker.commit_callback - function="TexturePicker.Commit" /> - </texture_picker> - <color_swatch - can_apply_immediately="true" - follows="left|top" - height="115" - label="Color/Tint" - layout="topleft" - left_pad="30" - name="Color/Tint" - tool_tip="Click to open color picker" - top_delta="0" - width="115" > - <color_swatch.commit_callback - function="ColorSwatch.Commit" /> - </color_swatch> + width="94" /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_edit_underpants.xml b/indra/newview/skins/default/xui/en/panel_edit_underpants.xml index 19225e9757..d43497c943 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_underpants.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_underpants.xml @@ -32,10 +32,7 @@ name="Fabric" tool_tip="Click to choose a picture" top="10" - width="64" > - <texture_picker.commit_callback - function="TexturePicker.Commit" /> - </texture_picker> + width="64" /> <color_swatch can_apply_immediately="true" follows="left|top" @@ -46,10 +43,7 @@ name="Color/Tint" tool_tip="Click to open color picker" top="10" - width="64" > - <color_swatch.commit_callback - function="ColorSwatch.Commit" /> - </color_swatch> + width="64" /> </panel> <panel border="false" @@ -65,7 +59,6 @@ top_pad="10" width="313"> <accordion - fit_parent="true" follows="all" height ="300" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml index 720a55dcc2..45c6ef4526 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml @@ -32,10 +32,7 @@ name="Fabric" tool_tip="Click to choose a picture" top="10" - width="64" > - <texture_picker.commit_callback - function="TexturePicker.Commit" /> - </texture_picker> + width="64" /> <color_swatch can_apply_immediately="true" follows="left|top" @@ -46,10 +43,7 @@ name="Color/Tint" tool_tip="Click to open Color Picker" top="10" - width="64" > - <color_swatch.commit_callback - function="ColorSwatch.Commit" /> - </color_swatch> + width="64" /> </panel> <panel border="false" @@ -65,7 +59,6 @@ top_pad="10" width="313"> <accordion - fit_parent="true" follows="all" height ="300" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml index 9fb777e0e7..dc2f085356 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml @@ -1,437 +1,414 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel background_visible="true" - bevel_style="in" + bevel_style="in" follows="all" height="570" - help_topic="edit_wearable" label="Wearable" layout="topleft" - left="0" +left="0" name="panel_edit_wearable" - top="0" + top="0" width="333"> - <string - name="edit_shape_title"> - Editing Shape - </string> - <string - name="edit_skin_title"> - Editing Skin - </string> - <string - name="edit_hair_title"> - Editing Hair - </string> - <string - name="edit_eyes_title"> - Editing Eyes - </string> - <string - name="edit_shirt_title"> - Editing Shirt - </string> - <string - name="edit_pants_title"> - Editing Pants - </string> - <string - name="edit_shoes_title"> - Editing Shoes - </string> - <string - name="edit_socks_title"> - Editing Socks - </string> - <string - name="edit_jacket_title"> - Editing Jacket - </string> - <string - name="edit_skirt_title"> - Editing Skirt - </string> - <string - name="edit_gloves_title"> - Editing Gloves - </string> - <string - name="edit_undershirt_title"> - Editing Undershirt - </string> - <string - name="edit_underpants_title"> - Editing Underpants - </string> - <string - name="edit_alpha_title"> - Editing Alpha Mask - </string> - <string - name="edit_tattoo_title"> - Editing Tattoo - </string> - <string - name="shape_desc_text"> - Shape: - </string> - <string - name="skin_desc_text"> - Skin: - </string> - <string - name="hair_desc_text"> - Hair: - </string> - <string - name="eyes_desc_text"> - Eyes: - </string> - <string - name="shirt_desc_text"> - Shirt: - </string> - <string - name="pants_desc_text"> - Pants: - </string> - <string - name="shoes_desc_text"> - Shoes: - </string> - <string - name="socks_desc_text"> - Socks: - </string> - <string - name="jacket_desc_text"> - Jacket: - </string> - <string - name="skirt_desc_text"> - Skirt: - </string> - <string - name="gloves_desc_text"> - Gloves: - </string> - <string - name="undershirt_desc_text"> - Undershirt: - </string> - <string - name="underpants_desc_text"> - Underpants: - </string> - <string - name="alpha_desc_text"> - Alpha Mask: - </string> - <string - name="tattoo_desc_text"> - Tattoo: - </string> - <!-- Default width of the button should be to show it without label. - Button will be extedned in code to show whole label when wearable is being changed. - --> - <labeled_back_button + <string + name="edit_shape_title"> + Editing Shape + </string> + <string + name="edit_skin_title"> + Editing Skin + </string> + <string + name="edit_hair_title"> + Editing Hair + </string> + <string + name="edit_eyes_title"> + Editing Eyes + </string> + <string + name="edit_shirt_title"> + Editing Shirt + </string> + <string + name="edit_pants_title"> + Editing Pants + </string> + <string + name="edit_shoes_title"> + Editing Shoes + </string> + <string + name="edit_socks_title"> + Editing Socks + </string> + <string + name="edit_jacket_title"> + Editing Jacket + </string> + <string + name="edit_skirt_title"> + Editing Skirt + </string> + <string + name="edit_gloves_title"> + Editing Gloves + </string> + <string + name="edit_undershirt_title"> + Editing Undershirt + </string> + <string + name="edit_underpants_title"> + Editing Underpants + </string> + <string + name="edit_alpha_title"> + Editing Alpha Mask + </string> + <string + name="edit_tattoo_title"> + Editing Tattoo + </string> + <string + name="shape_desc_text"> + Shape: + </string> + <string + name="skin_desc_text"> + Skin: + </string> + <string + name="hair_desc_text"> + Hair: + </string> + <string + name="eyes_desc_text"> + Eyes: + </string> + <string + name="shirt_desc_text"> + Shirt: + </string> + <string + name="pants_desc_text"> + Pants: + </string> + <string + name="shoes_desc_text"> + Shoes: + </string> + <string + name="socks_desc_text"> + Socks: + </string> + <string + name="jacket_desc_text"> + Jacket: + </string> + <string + name="skirt_skirt_desc_text"> + Skirt: + </string> + <string + name="gloves_desc_text"> + Gloves: + </string> + <string + name="undershirt_desc_text"> + Undershirt: + </string> + <string + name="underpants_desc_text"> + Underpants: + </string> + <string + name="alpha_desc_text"> + Alpha Mask: + </string> + <string + name="tattoo_desc_text"> + Tattoo: + </string> + <button follows="top|left" - height="24" - image_hover_unselected="BackButton_Over" - image_pressed="BackButton_Press" - image_unselected="BackButton_Off" + height="25" + width="25" + image_overlay="BackArrow_Off" layout="topleft" - label="Save" - left="11" name="back_btn" - pad_left="24" - tool_tip="Return to Edit Outfit" - top="3" - width="30" /> - <text - follows="top|left|right" - font="SansSerifHugeBold" - height="22" - layout="topleft" - left_pad="8" - name="edit_wearable_title" - text_color="white" - top="3" - value="Editing Shape" - use_ellipses="true" - width="274" /> - <panel - background_opaque="true" - background_visible="true" - bg_alpha_color="DkGray2" - bg_opaque_color="DkGray2" - border="false" - follows="top|left|right" - height="60" - label="Shirt" - layout="topleft" left="10" - name="wearable_type_panel" - top_pad="10" - width="313"> - <text + top="7" /> + <text + follows="top|left" + font="SansSerifHugeBold" + height="22" + layout="topleft" + left_pad="15" + name="edit_wearable_title" + text_color="white" + value="Editing Shape" + width="270" /> + <panel + border="false" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" + background_visible="true" + background_opaque="true" follows="top|left|right" - font="SansSerifSmallBold" - height="16" - layout="topleft" - left="10" - name="description_text" - text_color="white" - top="10" - value="Shape:" - width="150" /> - <radio_group - control_name="AvatarSex" - follows="left|top|right" - height="20" - layout="topleft" - left="210" - name="sex_radio" - top="5" - width="110"> - <radio_item - follows="all" - height="16" - label="" - layout="topleft" - left="0" - name="sex_male" - tool_tip="Male" - value="1" - width="40" /> - <radio_item - follows="all" - height="16" - label="" - layout="topleft" - left_pad="10" - name="sex_female" - tool_tip="Female" - value="0" - width="40"/> - </radio_group> - <!-- graphical labels for the radio buttons above --> - <icon - height="16" - image_name="icons/Male.png" - layout="topleft" - left="230" - name="male_icon" - tool_tip="Male" - top="7" - width="16" /> - <icon - height="16" - image_name="icons/Female.png" - layout="topleft" - left="280" - name="female_icon" - tool_tip="Female" - top="7" - width="16" /> - <line_editor - follows="all" - height="23" - layout="topleft" - left="10" - max_length="63" - name="description" - prevalidate_callback="ascii" - select_on_focus="true" - text_color="black" - top_pad="3" - width="290" /> - </panel> - <panel - follows="all" - height="433" - layout="topleft" - left="0" - name="edit_subpanel_container" - top_pad="2" - width="333"> - <!-- the shape editing panel is taller than the others - because it also displays avatar height --> - <panel - filename="panel_edit_shape.xml" - follows="all" - height="433" - layout="topleft" - left="0" - name="edit_shape_panel" - top="0" - visible="false" - width="333" /> - <panel - filename="panel_edit_skin.xml" - follows="all" - height="425" - layout="topleft" - left="0" - name="edit_skin_panel" - top="8" - visible="false" - width="333" /> - <panel - filename="panel_edit_hair.xml" - follows="all" - height="425" - layout="topleft" - left="0" - name="edit_hair_panel" - top="8" - visible="false" - width="333" /> - <panel - filename="panel_edit_eyes.xml" - follows="all" - height="425" - layout="topleft" - left="0" - name="edit_eyes_panel" - top="8" - visible="false" - width="333" /> - <panel - filename="panel_edit_shirt.xml" - follows="all" - height="425" - layout="topleft" - left="0" - name="edit_shirt_panel" - top="8" - visible="false" - width="333" /> - <panel - filename="panel_edit_pants.xml" - follows="all" - height="425" + height="60" + label="Shirt" layout="topleft" - left="0" - name="edit_pants_panel" - top="8" - visible="false" - width="333" /> - <panel - filename="panel_edit_shoes.xml" - follows="all" - height="425" - layout="topleft" - left="0" - name="edit_shoes_panel" - top="8" - visible="false" - width="333" /> - <panel - filename="panel_edit_socks.xml" - follows="all" - height="425" - layout="topleft" - left="0" - name="edit_socks_panel" - top="8" - visible="false" - width="333" /> - <panel - filename="panel_edit_jacket.xml" - follows="all" - height="425" - layout="topleft" - left="0" - name="edit_jacket_panel" - top="8" - visible="false" - width="333" /> - <panel - filename="panel_edit_skirt.xml" - follows="all" - height="425" - layout="topleft" - left="0" - name="edit_skirt_panel" - top="8" - visible="false" - width="333" /> - <panel - filename="panel_edit_gloves.xml" - follows="all" - height="425" - layout="topleft" - left="0" - name="edit_gloves_panel" - top="8" - visible="false" - width="333" /> - <panel - filename="panel_edit_undershirt.xml" - follows="all" - height="425" - layout="topleft" - left="0" - name="edit_undershirt_panel" - top="8" - visible="false" - width="333" /> - <panel - filename="panel_edit_underpants.xml" - follows="all" - height="425" - layout="topleft" - left="0" - name="edit_underpants_panel" - top="8" - visible="false" - width="333" /> - <panel - filename="panel_edit_alpha.xml" - follows="all" - height="425" - layout="topleft" - left="0" - name="edit_alpha_panel" - top="8" - visible="false" - width="333" /> - <panel - filename="panel_edit_tattoo.xml" - follows="all" - height="425" - layout="topleft" - left="0" - name="edit_tattoo_panel" - top="8" - visible="false" - width="333" /> - </panel> - <panel - follows="bottom|left|right" - height="23" - layout="topleft" - left="2" - name="button_panel" - top_pad="6" - width="333"> + left="10" + name="wearable_type_panel" + top_pad="10" + width="313"> + <text + follows="top|left|right" + height="16" + layout="topleft" + left="10" + name="description_text" + value="Shape:" + width="303" /> + <text_editor + follows="all" + height="23" + left="10" + layout="topleft" + max_length="300" + name="description" + width="290" /> + </panel> + <panel + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_subpanel_container" + top_pad="10" + width="333"> + <panel + filename="panel_edit_shape.xml" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_shape_panel" + top="0" + visible="false" + width="333" /> + <panel + filename="panel_edit_skin.xml" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_skin_panel" + top="0" + visible="false" + width="333" /> + <panel + filename="panel_edit_hair.xml" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_hair_panel" + top="0" + visible="false" + width="333" /> + <panel + filename="panel_edit_eyes.xml" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_eyes_panel" + top="0" + visible="false" + width="333" /> + <panel + filename="panel_edit_shirt.xml" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_shirt_panel" + top="0" + visible="false" + width="333" /> + <panel + filename="panel_edit_pants.xml" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_pants_panel" + top="0" + visible="false" + width="333" /> + <panel + filename="panel_edit_shoes.xml" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_shoes_panel" + top="0" + visible="false" + width="333" /> + <panel + filename="panel_edit_socks.xml" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_socks_panel" + top="0" + visible="false" + width="333" /> + <panel + filename="panel_edit_jacket.xml" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_jacket_panel" + top="0" + visible="false" + width="333" /> + <panel + filename="panel_edit_skirt.xml" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_skirt_panel" + top="0" + visible="false" + width="333" /> + <panel + filename="panel_edit_gloves.xml" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_gloves_panel" + top="0" + visible="false" + width="333" /> + <panel + filename="panel_edit_undershirt.xml" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_undershirt_panel" + top="0" + visible="false" + width="333" /> + <panel + filename="panel_edit_underpants.xml" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_underpants_panel" + top="0" + visible="false" + width="333" /> + <panel + filename="panel_edit_alpha.xml" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_alpha_panel" + top="0" + visible="false" + width="333" /> + <panel + filename="panel_edit_tattoo.xml" + follows="all" + height="400" + layout="topleft" + left="0" + name="edit_tattoo_panel" + top="0" + visible="false" + width="333" /> + </panel> + <panel + follows="left|right|bottom" + height="38" + label="gear_buttom_panel" + layout="bottom|left|right" + left="0" + bottom="25" + name="gear_buttom_panel" + width="333"> <button - follows="bottomleft" - height="23" - label="Save As" - layout="topleft" - left="8" - name="save_as_button" - top="0" - width="153" /> + follows="bottom|left" + tool_tip="Options" + height="18" + image_disabled="OptionsMenu_Disabled" + image_selected="OptionsMenu_Press" + image_unselected="OptionsMenu_Off" + layout="topleft" + left="10" + name="friends_viewsort_btn" + top="10" + width="18" /> <button - follows="bottomleft" - height="23" - label="Undo Changes" - layout="topleft" - left_pad="7" - name="revert_button" - width="152" /> - </panel> + follows="bottom|left" + height="18" + image_selected="AddItem_Press" + image_unselected="AddItem_Off" + image_disabled="AddItem_Disabled" + layout="topleft" + left_pad="10" + name="add_btn" + tool_tip="TODO" + width="18" /> + <button + follows="bottom|left" + height="18" + image_selected="TrashItem_Press" + image_unselected="TrashItem_Off" + image_disabled="TrashItem_Disabled" + layout="topleft" + left_pad="10" + right="-10" + name="del_btn" + tool_tip="TODO" + top_delta="0" + width="18" /> + </panel> + <panel + follows="bottom|left|right" + height="25" + layout="bottom|left|right" + left="0" + name="button_panel" + bottom="5" + width="333" > + <button + follows="bottomleft" + layout="topleft" + height="23" + label="Save As" + left="8" + name="save_as_button" + top="0" + width="153" /> + <button + follows="bottomleft" + layout="topleft" + height="23" + label="Revert" + left_pad="7" + name="revert_button" + width="153" /> + </panel> </panel> 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 2af1a84400..9341d433e8 100644 --- a/indra/newview/skins/default/xui/en/panel_group_general.xml +++ b/indra/newview/skins/default/xui/en/panel_group_general.xml @@ -28,7 +28,6 @@ Hover your mouse over the options for more help. width="304" layout="topleft"> <texture_picker - default_image_name="Generic_Group_Large" follows="left|top" height="110" label="" @@ -243,7 +242,7 @@ Hover your mouse over the options for more help. top_pad="4" width="190"> <combo_item name="select_mature" value="Select"> - - Select maturity rating - + - Select Mature - </combo_item> <combo_box.item label="Moderate Content" diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml index 4998322d62..789d69bc68 100644 --- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml @@ -36,16 +36,14 @@ background_visible="true" layout="topleft"> <button follows="top|right" - height="24" - image_hover_unselected="BackButton_Over" - image_pressed="BackButton_Press" - image_unselected="BackButton_Off" + height="23" + image_overlay="BackArrow_Off" layout="topleft" name="back" - left="7" + left="8" tab_stop="false" top="2" - width="30" /> + width="23" /> <text_editor allow_scroll="false" bg_visible="false" @@ -57,9 +55,9 @@ background_visible="true" font="SansSerifHugeBold" h_pad="0" height="26" - left_pad="8" + left_pad="10" text_color="LtGray" - top="1" + top="0" use_ellipses="true" width="275" follows="top|left|right" @@ -95,9 +93,7 @@ background_visible="true" name="group_accordions" follows="all" layout="topleft" - auto_resize="true" - height="513" - width="313"> + auto_resize="true"> <accordion left="0" top="0" @@ -105,9 +101,7 @@ background_visible="true" fit_parent="true" follows="all" layout="topleft" - name="groups_accordion" - height="513" - width="313"> + name="groups_accordion"> <accordion_tab expanded="true" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml index 41f2b28004..479629f6ea 100644 --- a/indra/newview/skins/default/xui/en/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml @@ -74,24 +74,23 @@ Maximum 200 per group daily </text> <button follows="top|left" - height="23" - image_overlay="AddItem_Off" - image_overlay_alignment="left" - imgoverlay_label_space="-10" - label="New Notice" + height="18" + image_selected="AddItem_Press" + image_unselected="AddItem_Off" + image_disabled="AddItem_Disabled" layout="topleft" left="5" name="create_new_notice" tool_tip="Create a new notice" - top_delta="0" - width="93" /> + top_delta="-3" + width="18" /> <button follows="top|left" height="23" image_overlay="Refresh_Off" layout="topleft" name="refresh_notices" - left="260" + left_pad="230" tool_tip="Refresh list of notices" top_delta="0" width="23" /> @@ -116,7 +115,7 @@ Maximum 200 per group daily mouse_opaque="false" name="lbl" text_color="EmphasisColor" - top="5" + top="0" width="200"> Create a Notice </text> @@ -211,23 +210,9 @@ Maximum 200 per group daily <button follows="left|top" layout="topleft" - left="20" - top_delta="50" - height="23" - width="100" - name="open_inventory" - label="Inventory" - tool_tip="Open Inventory"> - <button.init_callback - function="Button.SetFloaterToggle" - parameter="inventory"/> - </button> - <button - follows="left|top" - layout="topleft" left="140" name="remove_attachment" - top_delta="0" + top_delta="50" height="18" image_selected="TrashItem_Press" image_unselected="TrashItem_Off" @@ -245,7 +230,7 @@ Maximum 200 per group daily name="send_notice" width="100" /> <group_drop_target - height="75" + height="95" top="160" left="10" layout="topleft" @@ -273,7 +258,7 @@ Maximum 200 per group daily mouse_opaque="false" name="lbl" text_color="EmphasisColor" - top_pad="5" + top_pad="0" width="265"> Archived Notice </text> diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml index 33a5e01e4c..29c6a17c31 100644 --- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml @@ -3,14 +3,14 @@ border="false" height="300" name="panel_im_control_panel" - width="119"> + width="110"> <avatar_icon follows="left|top" height="105" left_delta="5" name="avatar_icon" top="-5" - width="114"/> + width="105"/> <layout_stack mouse_opaque="false" border_size="0" @@ -22,7 +22,7 @@ name="button_stack" orientation="vertical" top_pad="5" - width="114"> + width="105"> <layout_panel mouse_opaque="false" auto_resize="true" @@ -31,7 +31,7 @@ layout="topleft" left="2" min_height="0" - width="109" + width="100" top="0" name="spacer" user_resize="false" /> @@ -41,7 +41,7 @@ height="20" layout="topleft" min_height="20" - width="109" + width="100" name="view_profile_btn_panel" user_resize="false"> <button @@ -50,7 +50,7 @@ label="Profile" name="view_profile_btn" top="0" - width="109" /> + width="100" /> </layout_panel> <layout_panel auto_resize="false" @@ -58,7 +58,7 @@ height="25" layout="topleft" min_height="25" - width="109" + width="100" name="add_friend_btn_panel" user_resize="false"> <button @@ -67,7 +67,7 @@ label="Add Friend" name="add_friend_btn" top="5" - width="109" /> + width="100" /> </layout_panel> <layout_panel auto_resize="false" @@ -75,7 +75,7 @@ height="25" layout="topleft" min_height="25" - width="109" + width="100" name="teleport_btn_panel" user_resize="false"> <button @@ -85,7 +85,7 @@ label="Teleport" name="teleport_btn" tool_tip = "Offer to teleport this person" - width="109" /> + width="100" /> </layout_panel> <layout_panel auto_resize="false" @@ -93,7 +93,7 @@ height="25" layout="topleft" min_height="25" - width="109" + width="100" name="share_btn_panel" user_resize="false"> <button @@ -102,7 +102,7 @@ height="23" label="Share" name="share_btn" - width="109" /> + width="100" /> </layout_panel> <layout_panel auto_resize="false" @@ -110,7 +110,7 @@ height="25" layout="topleft" min_height="25" - width="109" + width="100" name="pay_btn_panel" user_resize="false"> <button @@ -119,7 +119,7 @@ height="23" label="Pay" name="pay_btn" - width="109" /> + width="100" /> </layout_panel> <layout_panel auto_resize="false" @@ -127,7 +127,7 @@ height="25" layout="topleft" min_height="25" - width="109" + width="100" name="call_btn_panel" user_resize="false"> <button @@ -135,7 +135,7 @@ height="23" label="Call" name="call_btn" - width="109" /> + width="100" /> </layout_panel> <layout_panel auto_resize="false" @@ -143,7 +143,7 @@ height="25" layout="topleft" min_height="25" - width="109" + width="100" name="end_call_btn_panel" user_resize="false" visible="false"> @@ -152,7 +152,7 @@ height="23" label="End Call" name="end_call_btn" - width="109" /> + width="100" /> </layout_panel> <layout_panel auto_resize="false" @@ -160,7 +160,7 @@ height="25" layout="topleft" min_height="25" - width="109" + width="100" name="voice_ctrls_btn_panel" user_resize="false" visible="false"> @@ -169,7 +169,7 @@ height="23" label="Voice Controls" name="voice_ctrls_btn" - width="109" /> + width="100" /> </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml index a0a1e2963a..31ba539c44 100644 --- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml @@ -46,38 +46,33 @@ <!-- Texture names for rating icons --> <string name="icon_PG" - translate="false" value="Parcel_PG_Dark" /> <string name="icon_M" - translate="false" value="Parcel_M_Dark" /> <string name="icon_R" - translate="false" value="Parcel_R_Dark" /> <button follows="top|right" - height="24" - image_hover_unselected="BackButton_Over" - image_pressed="BackButton_Press" - image_unselected="BackButton_Off" + height="23" + image_overlay="BackArrow_Off" layout="topleft" - left="9" + left="11" name="back_btn" tool_tip="Back" tab_stop="false" top="4" - width="30" /> + width="23" /> <text follows="top|left|right" font="SansSerifHugeBold" height="26" layout="topleft" - left_pad="7" + left_pad="10" name="title" text_color="LtGray" - top="3" + top="2" use_ellipses="true" value="Place Profile" width="280" /> @@ -103,8 +98,7 @@ width="310"> <texture_picker enabled="false" - fallback_image="default_land_picture.j2c" - follows="left|top|right" + follows="left|top|right" height="197" layout="topleft" left="11" diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index 0499873fb0..01adc00e1a 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -56,23 +56,42 @@ height="80"> follows="left|bottom" font="SansSerifSmall" height="16" -name="username_text" +name="first_name_text" top="20" left="20" width="150"> -Username: +First name: </text> <line_editor follows="left|bottom" height="22" -label="Username" +label="First" left_delta="0" max_length="31" -name="username_edit" +name="first_name_edit" select_on_focus="true" -tool_tip="[SECOND_LIFE] Username" +tool_tip="[SECOND_LIFE] First Name" top_pad="0" -width="150" /> + width="135" /> + <text + follows="left|bottom" + font="SansSerifSmall" + height="16" + left_pad="8" + name="last_name_text" + top="20" + width="150"> + Last name: </text> +<line_editor +follows="left|bottom" +height="22" +label="Last" +max_length="31" +name="last_name_edit" +select_on_focus="true" +tool_tip="[SECOND_LIFE] Last Name" + top_pad="0" + width="135" /> <text follows="left|bottom" font="SansSerifSmall" @@ -148,7 +167,6 @@ allow_text_entry="true" font="SansSerifSmall" follows="left|right|bottom" height="23" - max_chars="256" layout="topleft" top_pad="2" name="server_combo" @@ -156,7 +174,6 @@ width="135" visible="false" /> </layout_panel> <layout_panel -tab_stop="false" follows="right|bottom" name="links" width="200" @@ -184,7 +201,7 @@ height="16" name="forgot_password_text" top_pad="12" right="-10" - width="180"> + width="210"> Forgot your name or password? </text> <text @@ -196,7 +213,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 16529f4064..1b04d01abf 100644 --- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel background_visible="true" - default_tab_group="1" follows="all" - height="423" + height="408" label="Things" layout="topleft" min_height="350" @@ -42,13 +41,13 @@ <filter_editor text_pad_left="10" follows="left|top|right" - height="23" + height="23" label="Filter Inventory" layout="topleft" left="10" max_length="300" name="inventory search editor" - top="18" + top="3" width="303" /> <tab_container bg_alpha_color="DkGray" @@ -62,16 +61,15 @@ left="7" name="inventory filter tabs" tab_height="30" - tab_group="1" tab_position="top" tab_min_width="100" top_pad="10" width="312"> <inventory_panel - bg_opaque_color="DkGray2" - bg_alpha_color="DkGray2" - background_visible="true" - background_opaque="true" + bg_opaque_color="DkGray2" + bg_alpha_color="DkGray2" + background_visible="true" + background_opaque="true" border="false" bevel_style="none" follows="all" @@ -82,14 +80,13 @@ left="0" name="All Items" sort_order_setting="InventorySortOrder" - show_item_link_overlays="true" top="16" width="288" /> - <recent_inventory_panel - bg_opaque_color="DkGray2" - bg_alpha_color="DkGray2" - background_visible="true" - background_opaque="true" + <inventory_panel + bg_opaque_color="DkGray2" + bg_alpha_color="DkGray2" + background_visible="true" + background_opaque="true" border="false" bevel_style="none" follows="all" @@ -99,95 +96,64 @@ layout="topleft" left_delta="0" name="Recent Items" - show_item_link_overlays="true" width="290" /> </tab_container> - <layout_stack - animate="false" - border_size="0" + + <panel + background_visible="true" + bevel_style="none" follows="left|right|bottom" - height="25" + height="27" layout="topleft" - orientation="horizontal" - top_pad="0" + top_pad="-1" left="10" name="bottom_panel" - width="307"> - <layout_panel - auto_resize="false" - height="25" - layout="topleft" - name="options_gear_btn_panel" - width="32"> - <button - follows="bottom|left" - tool_tip="Show additional options" - 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="0" - name="options_gear_btn" - top="0" - width="31" /> - </layout_panel> - <layout_panel - auto_resize="false" - height="25" - layout="topleft" - name="add_btn_panel" - width="32"> - <button - follows="bottom|left" - height="25" - image_hover_unselected="Toolbar_Middle_Over" - image_overlay="AddItem_Off" - image_selected="Toolbar_Middle_Selected" - image_unselected="Toolbar_Middle_Off" - layout="topleft" - left="0" - name="add_btn" - tool_tip="Add new item" - top="0" - width="31" /> - </layout_panel> - <layout_panel - auto_resize="true" - height="25" - layout="topleft" - name="dummy_panel" - width="212"> - <icon - follows="bottom|left|right" - height="25" - image_name="Toolbar_Middle_Off" - layout="topleft" - left="0" - top="0" - name="dummy_icon" - width="211" /> - </layout_panel> - <layout_panel - auto_resize="false" - height="25" - layout="topleft" - name="trash_btn_panel" - width="31"> - <dnd_button - 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="0" - layout="topleft" - name="trash_btn" - tool_tip="Remove selected item" - top="0" - width="31"/> - </layout_panel> - </layout_stack> + width="310"> + <button + follows="bottom|left" + tool_tip="Show additional options" + 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="0" + name="options_gear_btn" + top="1" + width="31" /> + <button + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="AddItem_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + left_pad="1" + name="add_btn" + tool_tip="Add new item" + 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|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" + name="trash_btn" + tool_tip="Remove selected item" + width="31"/> + </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml index 2e49fc8d6f..5e41d65720 100644 --- a/indra/newview/skins/default/xui/en/panel_my_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml @@ -83,7 +83,6 @@ allow_no_texture="true" default_image_name="None" enabled="false" - fallback_image="Generic_Person_Large" follows="top|left" height="124" layout="topleft" @@ -141,7 +140,6 @@ allow_no_texture="true" default_image_name="None" enabled="false" - fallback_image="Generic_Person_Large" follows="top|left" height="124" layout="topleft" @@ -403,6 +401,14 @@ name="edit_profile_btn" tool_tip="Edit your personal information" width="152" /> + <button + follows="bottom|right" + height="23" + label="Edit Appearance" + left_pad="3" + name="edit_appearance_btn" + tool_tip="Create/edit your appearance: physical data, clothes and etc." + width="153" /> </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml index cf174da2f0..c1800384a3 100644 --- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml @@ -5,8 +5,8 @@ border="false" height="600" follows="all" + label="Outfit Edit" layout="topleft" - help_topic="edit_outfit" left="0" min_height="350" name="outfit_edit" @@ -15,28 +15,6 @@ <string name="No Outfit" value="No Outfit"/> - <string - name="unsaved_changes" - value="Unsaved Changes"/> - <string - name="now_editing" - value="Now Editing"/> - <string - name="folder_view_off" - value="Hierarchy_View_Disabled" - translate="false"/> - <string - name="folder_view_on" - value="Hierarchy_View_On" - translate="false"/> - <string - name="list_view_off" - value="List_View_Disabled" - translate="false"/> - <string - name="list_view_on" - value="List_View_On" - translate="false"/> <panel.string name="not_available"> @@ -47,35 +25,23 @@ (unknown) </panel.string> - <!-- Wearables filtering strings --> - <string name="Filter.All" value="All"/> - <string name="Filter.Clothes/Body" value="Clothes/Body"/> - <string name="Filter.Objects" value="Objects"/> - <string name="Filter.Clothing" value="Clothing"/> - <string name="Filter.Bodyparts" value="Body parts"/> - - <string - name="replace_body_part" - value="Click to replace your existing shape"/> <button follows="top|left" - height="24" - image_hover_unselected="BackButton_Over" - image_pressed="BackButton_Press" - image_unselected="BackButton_Off" + height="23" + image_overlay="BackArrow_Off" layout="topleft" name="back_btn" left="5" tab_stop="false" - top="1" - width="30" /> + top="2" + width="23" /> <text follows="top|right" font="SansSerifHugeBold" height="26" layout="topleft" - left_pad="10" + left_pad="20" name="title" text_color="LtGray" top="0" @@ -85,448 +51,299 @@ <!-- "HEADER WITH ICON, STATUS TEXT AND OUTFIT NAME" --> <panel - background_visible="true" - bg_alpha_color="DkGray2" bevel_style="none" follows="top|left|right" - height="40" + height="45" + label="bottom_panel" layout="topleft" - left="6" + left="5" name="header_panel" top_pad="5" - width="311"> + width="300"> <icon follows="left|top" - height="31" - image_name="Shirt_Large" + height="40" + image_name="t-shirt-image" left="2" mouse_opaque="false" name="outfit_icon" - top="2" + top="1" scale_image="true" visible="true" - width="31" /> + width="35" /> <panel bevel_style="none" follows="top|right" - height="37" + height="40" + label="bottom_panel" layout="topleft" - left_pad="5" + left_pad="10" name="outfit_name_and_status" top="2" - width="270"> + width="200"> <text follows="top|left|right" - font="SansSerifSmallBold" + font="SansSerif" height="13" layout="topleft" name="status" - text_color="EmphasisColor" - top="2" - value="Now editing..." + text_color="Green" + top="0" + value="Editing..." use_ellipses="true" - width="245" /> + width="275" /> <text follows="bottom|left|right" - font="SansSerifLargeBold" - height="18" + font="SansSerifHugeBold" + height="26" layout="topleft" name="curr_outfit_name" text_color="LtGray" - top_pad="2" + top_pad="0" value="[Current Outfit]" use_ellipses="true" - width="245" /> - <loading_indicator - follows="right|top" - height="24" - layout="topleft" - right="-2" - name="edit_outfit_loading_indicator" - top="6" - width="24" /> + width="275" /> </panel> </panel> <!-- LIST OF WEARABLES (CURRENT OUTFIT/ WEARABLES TO ADD) --> -<!-- *NOTE: border_size is used to calculate space between layout panels and also to calculate resize bar's height. -Required height for dragbar (icon in spec) is 10, so resizebar height should be 10 px. -It is calculated as border_size + 2*UIResizeBarOverlap ---> <layout_stack - animate="true" - border_size="8" - clip="false" + animate="false" default_tab_group="2" follows="all" - height="465" - width="313" + height="470" + width="300" layout="topleft" orientation="vertical" name="im_panels" tab_group="1" - top_pad="5" + top_pad="10" left="5"> <layout_panel layout="topleft" - height="187" - min_height="155" + follows="left|top|right" + height="220" + label="IM Control Panel" + min_height="100" name="outfit_wearables_panel" - width="313" + width="300" auto_resize="true" user_resize="true"> - <layout_stack - animate="true" - border_size="0" - follows="all" - height="185" - width="313" + <scroll_list + width="300" + column_padding="0" + draw_heading="false" + draw_stripes="false" + follows="left|top|right|bottom" layout="topleft" - name="filter_panels" - top="0" - left="0"> - <layout_panel - auto_resize="true" - background_visible="false" - layout="topleft" - height="154" - name="add_button_and_combobox" - width="311" - user_resize="false" - visible="true"> - - <!-- List containing items from the COF and Base outfit --> - <panel - background_visible="false" - class="cof_wearables" - filename="panel_cof_wearables.xml" - follows="all" - height="129" - layout="topleft" - left="1" - name="cof_wearables_list" - top="0" - width="311" /> - - <button - follows="left|bottom" - height="22" - image_pressed="PushButton_Press" - image_pressed_selected="PushButton_Selected_Press" - image_selected="PushButton_Selected_Press" - is_toggle="true" - label="Add More..." - layout="topleft" - left="2" - name="show_add_wearables_btn" - top_pad="2" - tool_tip="Open/Close" - width="125" /> - - <combo_box - follows="left|right|bottom" - height="22" - layout="topleft" - left_pad="5" - name="list_view_filter_combobox" - top_delta="0" - visible="false" - width="152"/> - <combo_box - follows="left|right|bottom" - height="22" - layout="topleft" - left_delta="0" - name="folder_view_filter_combobox" - top_delta="0" - visible="false" - width="152"/> - - <button - follows="bottom|right" - height="22" - image_overlay="Search_Icon" - image_pressed="PushButton_Press" - image_pressed_selected="PushButton_Selected_Press" - image_selected="PushButton_Selected_Press" - is_toggle="true" - layout="topleft" - name="filter_button" - right="-5" - top_delta="0" - visible="false" - width="20" /> - </layout_panel> - - <layout_panel - auto_resize="false" - background_visible="true" - bg_alpha_color="DkGray2" - height="30" - name="filter_panel" - width="311" - visible="false" - user_resize="false"> + name="look_items_list" + search_column="1" + sort_column="2" + left="0" + height="193" + top="0"> + <scroll_list.columns + label="Look Item" + name="look_item" + width="285" /> + <scroll_list.columns + label="Outfit Item Sort" + width="0" + sort_column="look_item_sort" + name="look_item_sort" /> + </scroll_list> - <filter_editor - background_image="TextField_Search_Off" - enabled="true" - follows="left|right|top" - label="Filter Inventory Wearables" - layout="topleft" - left="5" - width="290" - height="25" - name="look_item_filter" - search_button_visible="true" - text_color="black" - visible="true"/> - - </layout_panel> - </layout_stack> + <panel + background_visible="true" + bevel_style="none" + follows="bottom|left|right" + height="27" + label="bottom_panel" + layout="topleft" + left="0" + name="edit_panel" + top_pad="0" + width="300"> + <button + follows="bottom|left" + 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="0" + name="gear_menu_btn" + top="1" + width="31" /> + <button + is_toggle="true" + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="AddItem_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + left_pad="1" + name="add_btn" + top="1" + width="31" /> + <button + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + left_pad="1" + name="new_btn" + top="1" + width="31" /> + <button + follows="bottom|right" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="TrashItem_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + name="trash_btn" + right="-1" + top="1" + width="31" /> + </panel> </layout_panel> <layout_panel - background_visible="false" - bg_alpha_color="DkGray2" auto_resize="true" default_tab_group="3" - height="450" - min_height="53" + height="250" + min_height="120" name="add_wearables_panel" - width="313" + width="300" tab_group="2" user_resize="true" visible="false"> - <!-- this icon represent dragbar between layout panels. - This is a workaround implemented in EXT-7255 becouse of an issue with layout stack (EXT-7471) --> - <icon + <text + follows="top|left|right" + font="SansSerifBold" + height="13" + layout="topleft" + left="5" + name="status" + text_color="LtGray" + top="5" + value="Add Wearables" + use_ellipses="true" + width="275" /> + + <filter_editor + background_image="TextField_Search_Off" follows="left|top|right" - height="10" - image_name="Dragbar" - left="0" - top_pad="-9" - width="313" /> + font="SansSerif" + label="Filter" + layout="topleft" + left="5" + width="290" + height="20" + name="look_item_filter" + text_color="black" + text_pad_left="25" /> <inventory_panel allow_multi_select="true" - background_visible="false" border="false" follows="left|top|right|bottom" - height="418" + height="176" layout="topleft" left="0" mouse_opaque="false" - name="folder_view" - top_pad="0" - width="313" - visible="false"/> + name="inventory_items" + top_pad="5" + width="300"/> + <panel - name="filtered_wearables_panel" - background_opaque="true" - background_visible="false" + background_visible="true" + bevel_style="none" + follows="left|right|bottom" + height="27" + label="add_wearables_button_bar" layout="topleft" - follows="left|top|right|bottom" - border="false" - height="418" left="0" - mouse_opaque="false" - width="310" - top_delta="0" - visible="true"> - <wearable_items_list - color="0.107 0.107 0.107 1" - name="list_view" - allow_select="true" + name="add_wearables_button_bar" + top_pad="0" + width="300"> + <button + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" layout="topleft" - follows="all" - multi_select="true" - width="313" - height="418" left="0" - top="0"/> + name="wearables_gear_menu_btn" + top="1" + width="31" /> + <button + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + label="F" + layout="topleft" + left_pad="1" + name="folder_view_btn" + top="1" + width="31" /> + <button + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + label="L" + layout="topleft" + left_pad="1" + name="list_view_btn" + top="1" + width="31" /> </panel> - <button - follows="bottom|left" - height="22" - left="2" - label="Wear Item" - layout="topleft" - name="plus_btn" - top_pad="5" - width="130" /> - </layout_panel> </layout_stack> - - <!-- BUTTON BAR --> - <panel - background_visible="true" - bevel_style="none" - follows="bottom|left|right" - height="27" - layout="topleft" - left="5" - name="no_add_wearables_button_bar" - top_pad="0" - width="313"> - <button - follows="bottom|left" - 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="0" - name="gear_menu_btn" - top="1" - width="31" /> - <icon - follows="bottom|left|right" - height="25" - image_name="Toolbar_Middle_Off" - layout="topleft" - left_pad="1" - name="dummy_right_icon" - width="250" /> - <button - follows="bottom|right" - height="25" - image_hover_unselected="Toolbar_Right_Over" - image_overlay="Shop" - image_selected="Toolbar_Right_Selected" - image_unselected="Toolbar_Right_Off" - layout="topleft" - left_pad="1" - name="shop_btn_1" - top="1" - tool_tip="Visit the SL Marketplace. You can also select something you are wearing, then click here to see more things like it" - width="31" /> - </panel> - - - <!-- BUTTON BAR - WEARABLES ADDING MODE --> - <panel - background_visible="true" - bevel_style="none" - follows="left|right|bottom" - height="27" - layout="topleft" - left="5" - name="add_wearables_button_bar" - top_delta="0" - visible="false" - width="313"> - <button - follows="bottom|left" - 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="0" - name="wearables_gear_menu_btn" - top="1" - width="31" /> - <button - follows="bottom|left" - height="25" - image_hover_unselected="Toolbar_Middle_Over" - image_overlay="Hierarchy_View_Disabled" - image_selected="Toolbar_Middle_Selected" - image_unselected="Toolbar_Middle_Off" - is_toggle="true" - layout="topleft" - left_pad="1" - name="folder_view_btn" - top="1" - width="31" /> - <button - follows="bottom|left" - height="25" - image_hover_unselected="Toolbar_Middle_Over" - image_overlay="List_View_On" - image_selected="Toolbar_Middle_Selected" - image_unselected="Toolbar_Middle_Off" - is_toggle="true" - layout="topleft" - left_pad="1" - name="list_view_btn" - top="1" - width="31" /> - <icon - follows="bottom|left|right" - height="25" - image_name="Toolbar_Middle_Off" - layout="topleft" - left_pad="1" - name="dummy_right_icon" - width="186" > - </icon> - <button - follows="bottom|right" - height="25" - image_hover_unselected="Toolbar_Right_Over" - image_overlay="Shop" - image_selected="Toolbar_Right_Selected" - image_unselected="Toolbar_Right_Off" - layout="topleft" - left_pad="1" - name="shop_btn_2" - top="1" - tool_tip="Visit the SL Marketplace. You can also select something you are wearing, then click here to see more things like it" - width="31" /> - </panel> - - <!-- SAVE AND REVERT BUTTONS --> <panel follows="left|right|bottom" height="30" layout="topleft" - left="4" - top_pad="2" + left="5" + top_pad="10" name="save_revert_button_bar" width="300"> <button - follows="bottom|left" + follows="bottom|left|right" height="23" label="Save" left="0" layout="topleft" name="save_btn" - top="0" - width="155" /> - <button - follows="bottom|left" - height="23" - name="save_flyout_btn" - label="" - layout="topleft" - left_pad="-20" - tab_stop="false" - top="0" - image_selected="SegmentedBtn_Right_Selected_Press" - image_unselected="SegmentedBtn_Right_Off" - image_pressed="SegmentedBtn_Right_Press" - image_pressed_selected="SegmentedBtn_Right_Selected_Press" - image_overlay="Arrow_Small_Up" - width="20"/> + width="145" /> <button follows="bottom|left|right" height="23" - left_pad="12" - label="Undo Changes" + left_pad="15" + label="Revert" layout="topleft" name="revert_btn" - top="0" - tool_tip="Revert to last saved version" - width="147" /> + width="145" /> </panel> </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 82b69ba8dc..66ed43efec 100644 --- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml @@ -5,98 +5,127 @@ background_opaque="true" background_visible="true" follows="all" - height="575" + height="570" label="Things" layout="topleft" min_height="350" min_width="240" width="320" border="false"> - <panel.string - name="wear_outfit_tooltip"> - Wear selected outfit - </panel.string> - <panel.string - name="wear_items_tooltip"> - Wear selected items - </panel.string> <tab_container follows="all" - height="539" + height="501" layout="topleft" - left="5" + left="7" name="appearance_tabs" - tab_min_width="150" + tab_min_width="140" tab_height="30" tab_position="top" halign="center" - top="8" - width="315"> - <panel - class="outfits_list" - filename="panel_outfits_list.xml" - height="520" - name="outfitslist_tab" + width="312"> + <inventory_panel background_visible="true" + background_opaque="true" + label="MY OUTFITS" help_topic="my_outfits_tab" + allow_multi_select="true" follows="all" - label="MY OUTFITS" - layout="topleft" - width="315" /> - <panel - background_visible="true" - bg_alpha_color="DkGray" - class="panel_wearing" - filename="panel_outfits_wearing.xml" + border="false" + left="0" + top="0" + width="315" + mouse_opaque="true" + name="outfitslist_tab" + start_folder="My Outfits" /> + <inventory_panel follows="all" - height="520" - help_topic="now_wearing_tab" + background_visible="true" + background_opaque="true" label="WEARING" - layout="topleft" + help_topic="now_wearing_tab" + allow_multi_select="true" + border="false" + left="0" + top="0" + mouse_opaque="true" name="cof_tab" + start_folder="Current Outfit" width="315" /> </tab_container> - - <panel + <panel background_visible="true" - follows="bottom|left|right" - height="27" - layout="topleft" - left="9" - top_pad="1" - visible="true" - name="bottom_panel" - width="310"> - <button - follows="bottom|left" - height="23" - label="Save As" - left="0" - layout="topleft" - name="save_btn" - top_pad="0" - width="155" /> - <button - follows="bottom|left" - height="23" - name="save_flyout_btn" - label="" - layout="topleft" - left_pad="-20" - tab_stop="false" - image_selected="SegmentedBtn_Right_Selected_Press" - image_unselected="SegmentedBtn_Right_Off" - image_pressed="SegmentedBtn_Right_Press" - image_pressed_selected="SegmentedBtn_Right_Selected_Press" - image_overlay="Arrow_Small_Up" - width="20"/> - <button - follows="bottom|left|right" - height="23" - label="Wear" - layout="topleft" - name="wear_btn" - left_pad="3" - width="152" /> - </panel> -</panel> + follows="bottom|left" + height="73" + layout="topleft" + left="9" + top_pad="-1" + visible="true" + name="bottom_panel" + width="310"> + <button + follows="bottom|left" + tool_tip="Show additional options" + 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="1" + name="options_gear_btn" + 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|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" + left_pad="1" + name="trash_btn" + tool_tip="Remove selected item" + width="31"/> + <button + follows="bottom|left" + height="23" + label="Save Outfit" + layout="topleft" + name="make_outfit_btn" + tool_tip="Save appearance as an outfit" + top_pad="6" + left="0" + width="153" /> + <button + follows="bottom|right" + height="23" + label="Wear" + layout="topleft" + name="wear_btn" + left_pad="3" + tool_tip="Wear selected outfit" + width="152" /> + <button + follows="bottom|left" + height="23" + label="Edit Outfit" + layout="topleft" + right="-140" + name="edit_current_outfit_btn" + top="26" + visible="false" + width="50" /> + </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 7cd0d5b5f0..6152dd1587 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <!-- Side tray panel --> <panel - default_tab_group="1" follows="all" height="449" label="People" @@ -12,17 +11,11 @@ top="0" width="333"> <string - name="no_recent_people" - value="No recent people. Looking for people to hang out with? Try [secondlife:///app/search/people Search] or the [secondlife:///app/worldmap World Map]." /> - <string - name="no_filtered_recent_people" - value="Didn't find what you're looking for? Try [secondlife:///app/search/people/[SEARCH_TERM] Search]." /> + name="no_people" + value="No people" /> <string name="no_one_near" - value="No one nearby. Looking for people to hang out with? Try [secondlife:///app/search/people Search] or the [secondlife:///app/worldmap World Map]." /> - <string - name="no_one_filtered_near" - value="Didn't find what you're looking for? Try [secondlife:///app/search/people/[SEARCH_TERM] Search]." /> + value="No one near" /> <string name="no_friends_online" value="No friends online" /> @@ -30,30 +23,21 @@ name="no_friends" value="No friends" /> <string - name="no_friends_msg"> - Find friends using [secondlife:///app/search/people Search] or right-click on a Resident to add them as a friend. -Looking for people to hang out with? Try the [secondlife:///app/worldmap World Map]. - </string> - <string - name="no_filtered_friends_msg"> - Didn't find what you're looking for? Try [secondlife:///app/search/people/[SEARCH_TERM] Search]. - </string> - <string name="people_filter_label" value="Filter People" /> <string name="groups_filter_label" value="Filter Groups" /> <!-- - *WORKAROUND: for group_list.no_items_msg & group_list.no_filtered_items_msg attributes. + *WORKAROUND: for group_list.no_groups_msg & group_list.no_filtered_groups_msg attributes. They are not defined as translatable in VLT. See EXT-5931 --> <string name="no_filtered_groups_msg" - value="Didn't find what you're looking for? Try [secondlife:///app/search/groups/[SEARCH_TERM] Search]." /> + value="[secondlife:///app/search/groups Try finding the group in search?]" /> <string name="no_groups_msg" - value="Looking for Groups to join? Try [secondlife:///app/search/groups Search]." /> + value="[secondlife:///app/search/groups Try searching for some groups to join.]" /> <filter_editor follows="left|top|right" height="23" @@ -72,7 +56,6 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M layout="topleft" left="5" name="tabs" - tab_group="1" tab_min_width="70" tab_height="30" tab_position="top" @@ -95,6 +78,8 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M width="313"> <avatar_list allow_select="true" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" follows="all" height="356" ignore_online_status="true" @@ -272,11 +257,14 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M <text follows="all" height="450" - left="13" - name="no_friends_help_text" + left="10" + name="no_friends_msg" top="10" width="293" - wrap="true" /> + wrap="true"> + To add friends try [secondlife:///app/search/people global search] or use right-click on a Resident to add them as a friend. +If you're looking for people to hang out with, [secondlife:///app/worldmap try the Map]. + </text> </panel> <panel background_opaque="true" @@ -297,12 +285,16 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M Values are set from appropriate strings at the top of file via LLPeoplePanel::postBuild() --> <group_list - allow_select="true" + background_visible="true" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" follows="all" height="356" layout="topleft" 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="307" /> <panel @@ -379,6 +371,9 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M width="313"> <avatar_list allow_select="true" + background_visible="true" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" follows="all" height="356" layout="topleft" @@ -454,7 +449,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M name="view_profile_btn" tool_tip="Show picture, groups, and other Residents information" top="0" - width="67" /> + width="70" /> <button follows="bottom|left" left_pad="3" @@ -463,7 +458,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M layout="topleft" name="im_btn" tool_tip="Open instant message session" - width="40" /> + width="43" /> <button follows="bottom|left" left_pad="3" @@ -480,8 +475,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M label="Share" layout="topleft" name="share_btn" - tool_tip="Share an inventory item" - width="65" /> + width="62" /> <button follows="bottom|left" left_pad="3" diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml index 292bd47207..41651edaa0 100644 --- a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml @@ -33,7 +33,7 @@ <texture_picker allow_no_texture="true" border_enabled="true" - fallback_image="default_land_picture.j2c" + default_image_name="TabIcon_Places_Large" enabled="false" follows="left|top" height="80" diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml index 35e8075896..a43b244fa0 100644 --- a/indra/newview/skins/default/xui/en/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml @@ -2,7 +2,7 @@ <panel background_visible="true" follows="all" - height="610" + height="570" layout="topleft" left="0" min_height="350" @@ -95,77 +95,60 @@ <!-- Texture names for parcel permissions icons --> <string name="icon_PG" - translate="false" value="Parcel_PG_Dark" /> <string name="icon_M" - translate="false" value="Parcel_M_Dark" /> <string name="icon_R" - translate="false" value="Parcel_R_Dark" /> <string name="icon_Voice" - translate="false" value="Parcel_Voice_Dark" /> <string name="icon_VoiceNo" - translate="false" value="Parcel_VoiceNo_Dark" /> <string name="icon_Fly" - translate="false" value="Parcel_Fly_Dark" /> <string name="icon_FlyNo" - translate="false" value="Parcel_FlyNo_Dark" /> <string name="icon_Push" - translate="false" value="Parcel_Push_Dark" /> <string name="icon_PushNo" - translate="false" value="Parcel_PushNo_Dark" /> <string name="icon_Build" - translate="false" value="Parcel_Build_Dark" /> <string name="icon_BuildNo" - translate="false" value="Parcel_BuildNo_Dark" /> <string name="icon_Scripts" - translate="false" value="Parcel_Scripts_Dark" /> <string name="icon_ScriptsNo" - translate="false" value="Parcel_ScriptsNo_Dark" /> <string name="icon_Damage" - translate="false" value="Parcel_Damage_Dark" /> <string name="icon_DamageNo" - translate="false" value="Parcel_DamageNo_Dark" /> <button follows="top|right" - height="24" - image_hover_unselected="BackButton_Over" - image_pressed="BackButton_Press" - image_unselected="BackButton_Off" + height="23" + image_overlay="BackArrow_Off" layout="topleft" - left="8" + left="11" name="back_btn" tool_tip="Back" tab_stop="false" top="4" - width="30" /> + width="23" /> <text follows="top|left|right" font="SansSerifHugeBold" @@ -174,14 +157,14 @@ left_pad="10" name="title" text_color="LtGray" - top="4" + top="2" use_ellipses="true" value="Place Profile" width="280" /> <scroll_container color="DkGray2" follows="all" - height="572" + height="532" layout="topleft" left="9" name="place_scroll" @@ -191,7 +174,7 @@ <panel bg_alpha_color="DkGray2" follows="left|top|right" - height="580" + height="540" layout="topleft" left="0" min_height="300" @@ -200,8 +183,7 @@ width="310"> <texture_picker enabled="false" - fallback_image="default_land_picture.j2c" - follows="left|top|right" + follows="left|top|right" height="197" layout="topleft" left="11" @@ -336,24 +318,21 @@ value="unknown" width="268" /> <accordion - fit_parent="true" follows="all" - height="268" + height="223" layout="topleft" - single_expansion="true" left="0" name="advanced_info_accordion" - top_pad="5" + top_pad="10" width="313"> <accordion_tab - fit_panel="false" - height="175" + height="170" layout="topleft" name="parcel_characteristics_tab" title="Parcel"> <panel follows="all" - height="175" + height="160" layout="topleft" left="0" name="parcel_characteristics_panel" @@ -550,8 +529,8 @@ name="about_land_btn" right="-5" tab_stop="false" - top_pad="2" - width="140"> + top="138" + width="90"> <click_callback function="Floater.Show" parameter="about_land" /> @@ -560,8 +539,7 @@ </accordion_tab> <accordion_tab expanded="false" - fit_panel="false" - height="125" + height="150" layout="topleft" name="region_information_tab" title="Region"> @@ -680,8 +658,7 @@ name="region_info_btn" right="-5" tab_stop="false" - top_pad="2" - width="180"> + width="105"> <click_callback function="Floater.Show" parameter="region_info" /> @@ -690,14 +667,13 @@ </accordion_tab> <accordion_tab expanded="false" - fit_panel="false" - height="180" + height="190" layout="topleft" name="estate_information_tab" title="Estate"> <panel follows="all" - height="180" + height="189" layout="topleft" left="0" name="estate_information_panel" @@ -780,14 +756,13 @@ </accordion_tab> <accordion_tab expanded="false" - fit_panel="false" - height="290" + height="320" layout="topleft" name="sales_tab" title="For Sale"> <panel follows="all" - height="290" + height="300" layout="topleft" left="0" name="sales_panel" diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml index 638e190e8f..c61007a9e1 100644 --- a/indra/newview/skins/default/xui/en/panel_places.xml +++ b/indra/newview/skins/default/xui/en/panel_places.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel background_visible="true" - default_tab_group="1" follows="all" height="570" label="Places" @@ -37,9 +36,7 @@ background_visible="true" left="6" name="Places Tabs" tab_min_width="80" - tab_max_width="157" tab_height="30" - tab_group="1" tab_position="top" top_pad="10" width="315" /> @@ -90,7 +87,6 @@ background_visible="true" layout="topleft" left_pad="3" name="map_btn" - tool_tip="Show the corresponding area on the World Map" width="85" /> <button follows="bottom|left" @@ -136,15 +132,5 @@ background_visible="true" right="-10" top="1" width="60" /> - <button - follows="bottom|left" - height="23" - label="Profile" - layout="topleft" - name="profile_btn" - right="-1" - tool_tip="Show place profile" - top="1" - width="111" /> </panel> </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 31d8ea27d9..69e8e6fdcc 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml @@ -94,16 +94,6 @@ Automatic position for: name="appearance_camera_movement" tool_tip="Use automatic camera positioning while in edit mode" width="242" /> - <check_box - control_name="SidebarCameraMovement" - follows="left|top" - height="16" - initial_value="true" - label="Sidebar" - layout="topleft" - name="appearance_sidebar_positioning" - tool_tip="Use automatic camera positioning for sidebar" - width="242" /> <icon follows="left|top" height="18" @@ -174,10 +164,9 @@ Automatic position for: label="Opacity" layout="topleft" left="80" - label_width="156" + label_width="60" name="bubble_chat_opacity" - top_pad = "10" - width="347" /> + width="200" /> <color_swatch can_apply_immediately="true" color="0 0 0 1" @@ -185,7 +174,7 @@ Automatic position for: follows="left|top" height="50" layout="topleft" - left_pad="30" + left_pad="10" top="190" name="background" tool_tip="Choose color for bubble chat" @@ -203,10 +192,10 @@ Automatic position for: follows="left|top" height="12" layout="topleft" - left="80" + left="30" name="UI Size:" - top_pad="25" - width="160"> + top_pad="5" + width="300"> UI size </text> <slider @@ -217,7 +206,7 @@ Automatic position for: increment="0.025" initial_value="1" layout="topleft" - left_pad="0" + left_delta="52" max_val="1.4" min_val="0.75" name="ui_scale_slider" @@ -315,7 +304,7 @@ Automatic position for: label="Other Devices" left="30" name="joystick_setup_button" - top="27" + top_pad="12" width="155"> <button.commit_callback function="Floater.Show" 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 a69e8d29b0..9eaabbe77b 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml @@ -348,10 +348,11 @@ Busy mode response: </text> <text_editor - control_name="BusyModeResponse" + control_name="BusyModeResponse2" text_readonly_color="LabelDisabledColor" bg_writeable_color="LtGray" use_ellipses="false" + hover="false" commit_on_focus_lost = "true" follows="left|top|right" height="60" 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 f4694180a1..44c44f5f59 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -160,7 +160,7 @@ layout="topleft" left="5" name="CustomGraphics Panel" - top="76" + top="124" width="485"> <text type="string" @@ -287,7 +287,7 @@ left_delta="2" name="AvatarRenderingText" top_pad="5" - width="158"> + width="128"> Avatar rendering: </text> <check_box @@ -332,26 +332,26 @@ increment="8" initial_value="160" label="Draw distance:" - label_width="185" + label_width="140" layout="topleft" - left="200" + left="216" max_val="512" min_val="64" name="DrawDistance" top="3" - width="296" /> + width="255" /> <text type="string" length="1" follows="left|top" height="12" layout="topleft" - left_delta="291" + left_delta="250" name="DrawDistanceMeterText2" top_delta="0" width="128"> m - </text> + </text> <slider control_name="RenderMaxPartCount" decimal_digits="0" @@ -360,29 +360,13 @@ increment="256" initial_value="4096" label="Max. particle count:" - label_width="185" + label_width="140" layout="topleft" - left="200" + left="216" max_val="8192" name="MaxParticleCount" top_pad="7" - width="303" /> - <slider - control_name="RenderAvatarMaxVisible" - decimal_digits="0" - follows="left|top" - height="16" - increment="1" - initial_value="12" - label="Max. # of non-impostor avatars:" - label_width="185" - layout="topleft" - left_delta="0" - max_val="65" - min_val="1" - name="MaxNumberAvatarDrawn" - top_pad="4" - width="290" /> + width="262" /> <slider control_name="RenderGlowResolutionPow" decimal_digits="0" @@ -391,15 +375,15 @@ increment="1" initial_value="8" label="Post process quality:" - label_width="185" + label_width="140" layout="topleft" - left="200" + left_delta="0" max_val="9" min_val="8" name="RenderPostProcess" show_text="false" top_pad="4" - width="264"> + width="223"> <slider.commit_callback function="Pref.UpdateSliderText" parameter="PostProcessText" /> @@ -423,14 +407,14 @@ increment="0.125" initial_value="160" label=" Objects:" - label_width="185" + label_width="140" layout="topleft" left_delta="0" max_val="2" name="ObjectMeshDetail" show_text="false" top_pad="6" - width="264"> + width="223"> <slider.commit_callback function="Pref.UpdateSliderText" parameter="ObjectMeshDetailText" /> @@ -441,13 +425,13 @@ height="16" initial_value="160" label=" Flexiprims:" - label_width="185" + label_width="140" layout="topleft" left_delta="0" name="FlexibleMeshDetail" show_text="false" top_pad="4" - width="264"> + width="223"> <slider.commit_callback function="Pref.UpdateSliderText" parameter="FlexibleMeshDetailText" /> @@ -459,13 +443,13 @@ increment="0.125" initial_value="160" label=" Trees:" - label_width="185" + label_width="140" layout="topleft" left_delta="0" name="TreeMeshDetail" show_text="false" top_pad="4" - width="264"> + width="223"> <slider.commit_callback function="Pref.UpdateSliderText" parameter="TreeMeshDetailText" /> @@ -477,13 +461,13 @@ increment="0.125" initial_value="160" label=" Avatars:" - label_width="185" + label_width="140" layout="topleft" left_delta="0" name="AvatarMeshDetail" show_text="false" top_pad="4" - width="264"> + width="223"> <slider.commit_callback function="Pref.UpdateSliderText" parameter="AvatarMeshDetailText" /> @@ -495,7 +479,7 @@ increment="0.125" initial_value="160" label=" Terrain:" - label_width="185" + label_width="140" layout="topleft" left_delta="0" max_val="2" @@ -503,7 +487,7 @@ name="TerrainMeshDetail" show_text="false" top_pad="4" - width="264"> + width="223"> <slider.commit_callback function="Pref.UpdateSliderText" parameter="TerrainMeshDetailText" /> @@ -517,7 +501,7 @@ increment="8" initial_value="160" label=" Sky:" - label_width="185" + label_width="140" layout="topleft" left_delta="0" max_val="128" @@ -525,7 +509,7 @@ name="SkyMeshDetail" show_text="false" top_pad="4" - width="264"> + width="223"> <slider.commit_callback function="Pref.UpdateSliderText" parameter="SkyMeshDetailText" /> @@ -536,9 +520,9 @@ follows="left|top" height="12" layout="topleft" - left="469" + left="444" name="PostProcessText" - top="60" + top="305" width="128"> Low </text> @@ -621,9 +605,9 @@ follows="left|top" height="12" layout="topleft" - left="200" + left_delta="-230" name="LightingDetailText" - top_pad="18" + top_pad="8" width="140"> Lighting detail: </text> @@ -632,13 +616,15 @@ draw_border="false" height="38" layout="topleft" + left_delta="0" name="LightingDetailRadio" top_pad="5" - width="200"> + width="321"> <radio_item height="16" label="Sun and moon only" layout="topleft" + left="3" name="SunMoon" value="0" top="3" @@ -647,6 +633,7 @@ height="16" label="Nearby local lights" layout="topleft" + left_delta="0" name="LocalLights" value="1" top_delta="16" @@ -658,9 +645,9 @@ follows="left|top" height="12" layout="topleft" - left_pad="-30" + left="358" name="TerrainDetailText" - top="226" + top="465" width="155"> Terrain detail: </text> @@ -672,21 +659,23 @@ left_delta="0" name="TerrainDetailRadio" top_pad="5" - width="70"> + width="321"> <radio_item height="16" label="Low" layout="topleft" + left="3" name="0" top="3" - width="50" /> + width="315" /> <radio_item height="16" label="High" layout="topleft" + left_delta="0" name="2" top_delta="16" - width="50" /> + width="315" /> </radio_group> </panel> 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 2c6ceeef2e..500e65b916 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml @@ -374,5 +374,5 @@ min_val="10" name="web_proxy_port" top_delta="0" - width="145" /> + width="140" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index fc33836c79..a666608103 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -83,7 +83,6 @@ allow_no_texture="true" default_image_name="None" enabled="false" - fallback_image="Generic_Person_Large" follows="top|left" height="124" layout="topleft" @@ -131,7 +130,6 @@ allow_no_texture="true" default_image_name="None" enabled="false" - fallback_image="Generic_Person_Large" follows="top|left" height="124" layout="topleft" @@ -391,6 +389,14 @@ name="edit_profile_btn" tool_tip="Edit your personal information" width="130" /> + <button + follows="bottom|right" + height="23" + label="Edit Appearance" + left_pad="10" + name="edit_appearance_btn" + tool_tip="Create/edit your appearance: physical data, clothes and etc." + width="130" /> </layout_panel> </layout_stack> diff --git a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml index a8cd380f20..f9c86fc75b 100644 --- a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml +++ b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - height="157" + height="152" layout="topleft" left="0" name="LLScrollingPanelParam" @@ -10,29 +10,25 @@ follows="left|top" height="16" layout="topleft" - left="12" + left="4" name="min param text" - text_color="White" - font_shadow="hard" - top="120" - width="120" /> + top="116" + width="128" /> <text follows="left|top" height="16" layout="topleft" - left="155" + left_pad="6" name="max param text" - text_color="White" - font_shadow="hard" top_delta="0" - width="120" /> + width="128" /> <text type="string" length="1" follows="left|top" height="16" layout="topleft" - left="12" + left="8" name="Loading..." top="11" width="128"> @@ -44,7 +40,7 @@ follows="left|top" height="16" layout="topleft" - left="155" + left_pad="6" name="Loading...2" top_delta="0" width="128"> @@ -53,30 +49,30 @@ <view_border layout="topleft" follows="left|top" - left="7" - top="5" + left="2" + top="0" width="132" height="132" thickness="2" - shadow_light_color="0.3 0.3 0.3 1" - highlight_light_color="0.3 0.3 0.3 1" - highlight_dark_color="0.3 0.3 0.3 1" - shadow_dark_color="0.3 0.3 0.3 1" + shadow_light_color="LtGray_50" + highlight_light_color="LtGray_50" + highlight_dark_color="LtGray_50" + shadow_dark_color="LtGray_50" bevel_style="in" name="left_border" /> <view_border layout="topleft" follows="left|top" - left_pad="10" + left_pad="2" top_delta="0" width="132" height="132" thickness="2" - shadow_light_color="0.3 0.3 0.3 1" - highlight_light_color="0.3 0.3 0.3 1" - highlight_dark_color="0.3 0.3 0.3 1" - shadow_dark_color="0.3 0.3 0.3 1" + shadow_light_color="LtGray_50" + highlight_light_color="LtGray_50" + highlight_dark_color="LtGray_50" + shadow_dark_color="LtGray_50" bevel_style="in" name="right_border" /> @@ -88,10 +84,10 @@ image_selected="PushButton_Selected" image_unselected="PushButton_Off" layout="topleft" - left="7" + left="2" name="less" tab_stop="false" - top="5" + top="0" width="132" /> <button enabled="false" @@ -101,7 +97,7 @@ image_selected="PushButton_Selected" image_unselected="PushButton_Off" layout="topleft" - left_pad="10" + left_pad="2" name="more" tab_stop="false" top_delta="0" @@ -114,11 +110,11 @@ increment="1" initial_value="0" label="[DESC]" - layout="bottom|left" + label_width="100" + layout="topleft" left="6" max_val="100" name="param slider" - bottom="1" - width="274" - slider_label.font.style="BOLD" /> + top="134" + width="258" /> </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 43513e1ab6..c2624ce0d0 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -41,50 +41,41 @@ name="buycurrencylabel"> L$ [AMT] </panel.string> - <panel - height="18" - left="-315" - width="95" - top="1" - follows="right|top" - name="balance_bg" - bg_visible="true" - background_opaque="true" - bg_opaque_image="bevel_background"> - <text + <button auto_resize="true" - halign="center" + halign="right" font="SansSerifSmall" - follows="all" - height="18" - left="0" - name="balance" + follows="right|top" + image_overlay="" + image_selected="spacer35.tga" + image_unselected="spacer35.tga" + image_pressed="spacer35.tga" + height="16" + right="-230" + label_shadow="false" + name="buycurrency" tool_tip="My Balance" - v_pad="4" - top="0" - wrap="false" - value="L$20" - width="40" /> + top="3" + width="120" /> <button auto_resize="true" - halign="center" + halign="right" font="SansSerifSmall" - follows="right|top|bottom" - image_hover_unselected="buy_over" - image_unselected="buy_off" - image_pressed="buy_press" - height="18" - label="BUY L$" - label_color="White" + follows="right|top" + image_selected="spacer35.tga" + image_unselected="spacer35.tga" + image_pressed="spacer35.tga" + height="16" + label="Buy L$" + label_color="EmphasisColor" left_pad="0" - label_shadow="true" + label_shadow="false" name="buyL" - pad_right="0" + pad_right="20" pad_bottom="2" tool_tip="Click to buy more L$" - top="0" + top="2" width="55" /> - </panel> <text type="string" font="SansSerifSmall" @@ -97,7 +88,7 @@ left_pad="0" name="TimeText" tool_tip="Current time (Pacific)" - width="145"> + width="100"> 24:00 AM PST </text> <button @@ -108,7 +99,7 @@ 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)" @@ -121,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" @@ -134,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 b48c5d1f8a..21addb8e6f 100644 --- a/indra/newview/skins/default/xui/en/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/en/panel_teleport_history.xml @@ -11,15 +11,9 @@ left="3" top="0" name="history_accordion" - background_visible="true" - bg_alpha_color="DkGray2" + background_visible="true" + bg_alpha_color="DkGray2" width="307"> - <no_matched_tabs_text - name="no_matched_teleports_msg" - value="Didn't find what you're looking for? Try [secondlife:///app/search/places/[SEARCH_TERM] Search]." /> - <no_visible_tabs_text - name="no_teleports_msg" - value="Teleport history is empty. Try [secondlife:///app/search/places/ Search]." /> <accordion_tab layout="topleft" name="today" diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml index 02ab0ffee5..c5efa2e221 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel background_visible="true" -default_tab_group="1" follows="all" height="570" label="Outfits" @@ -15,97 +14,63 @@ width="333"> <string name="No Outfit" value="No Outfit" /> - <string - name="Unsaved Changes" - value="Unsaved changes" /> - <string - name="Now Wearing" - value="Now wearing..." /> - <string - name="Changing outfits" - value="Changing outfits" /> <panel - background_opaque="true" - background_visible="true" - bg_opaque_color="DkGray2" - left="10" - top="5" - follows="left|top|right" + left="0" + top="0" + follows="all" layout="topleft" - width="303" + width="330" height="33" name="panel_currentlook" > <button follows="left|top" - left="205" top="7" width="20" height="20" - label="E" + top="0" width="1" height="1" layout="topleft" - name="editappearance_btn" - visible="false" /> + left="0" + name="editappearance_btn" /> <button follows="left|top" - left="235" top="7" width="20" height="20" - label="O" + top="0" width="1" height="1" layout="topleft" - name="openoutfit_btn" - visible="false" /> + left="0" + name="openoutfit_btn" /> <icon follows="top|left" - height="31" - image_name="Shirt_Large" + height="24" + image_name="TabIcon_Appearance_Off" name="outfit_icon" mouse_opaque="false" visible="true" - left="1" + left="9" top="0" - width="31" /> - <text - font="SansSerifSmall" - text_color="EmphasisColor" - width="300" - height="10" - follows="top|left" - layout="topleft" - left="35" - top="3" - mouse_opaque="false" - name="currentlook_status" > - (Status) - </text> + width="24" /> <text - font="SansSerifLargeBold" + font="SansSerifHugeBold" height="20" - left="35" - text_color="White" - top="15" + left_pad="5" + text_color="LtGray" + top="0" use_ellipses="true" - width="230" + width="305" follows="top|left" - word_wrap="false" + word_wrap="true" mouse_opaque="false" name="currentlook_name"> MyOutfit With a really Long Name like MOOSE </text> - <button - follows="left|top" - height="28" - image_overlay="Edit_Wrench" - label="" - layout="topleft" - left="265" - name="edit_outfit_btn" - tool_tip="Edit this outfit" - top="3" - width="28" /> - <loading_indicator - follows="left|top" - height="24" + <text + font="SansSerifSmall" + text_color="White_50" + width="300" + height="1" + follows="top|left" layout="topleft" - left="268" - name="wearables_loading_indicator" - top="6" - width="24" /> + top_pad="5" + mouse_opaque="false" + name="currentlook_title" > + (unsaved) + </text> </panel> <filter_editor height="23" @@ -115,19 +80,16 @@ width="333"> label="Filter Outfits" max_length="300" name="Filter" - search_button_visible="true" top_pad="10" width="303" /> <panel class="panel_outfits_inventory" filename="panel_outfits_inventory.xml" name="panel_outfits_inventory" - height="493" + height="505" min_height="410" width="320" - visible="false" left="0" - tab_group="1" top_pad="6" follows="all" /> <!-- <button @@ -142,13 +104,13 @@ width="333"> <panel class="panel_outfit_edit" filename="panel_outfit_edit.xml" - height="565" + height="550" follows="all" layout="topleft" left="5" min_height="410" name="panel_outfit_edit" - top="2" + top="5" visible="false" width="320"/> <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 49b252174c..b840fdd31b 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml @@ -1,10 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel + auto_tile="true" height="570" layout="topleft" name="item properties" help_topic="item_properties" - title="Item Profile" + save_rect="true" + title="Object Profile" width="333"> <panel.string name="unknown"> @@ -26,14 +28,6 @@ name="acquiredDate"> [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] </panel.string> - <panel.string - name="origin_inventory"> - (Inventory) - </panel.string> - <panel.string - name="origin_inworld"> - (Inworld) - </panel.string> <icon follows="top|right" height="18" @@ -46,45 +40,42 @@ width="18" /> <button follows="top|right" - height="24" - image_hover_unselected="BackButton_Over" - image_pressed="BackButton_Press" - image_unselected="BackButton_Off" + height="23" + image_overlay="BackArrow_Off" layout="topleft" - left="12" + left="14" name="back_btn" tab_stop="false" top="2" - width="30" /> + width="23" /> <text follows="top|left|right" font="SansSerifHugeBold" height="26" layout="topleft" - left_pad="3" + left_pad="10" name="title" text_color="LtGray" - top="2" + top="0" use_ellipses="true" - value="Item Profile" + value="Object Profile" width="275" /> <text follows="top|left" height="13" layout="topleft" left="45" - name="origin" + name="where" text_color="LtGray_50" value="(Inventory)" width="150" /> <panel follows="all" height="493" - help_topic="" label="" layout="topleft" left="9" - name="item_profile" + help_topic="" top="45" width="313" background_visible="true" @@ -166,49 +157,51 @@ name="LabelCreatorName" top_delta="6" width="140"> - </text> - <button - follows="top|right" - height="16" - image_selected="Inspector_I" - image_unselected="Inspector_I" - layout="topleft" - right="-5" - name="BtnCreator" - top_delta="-6" - width="16" /> - <text - type="string" - length="1" - follows="left|top" - height="23" - layout="topleft" - left="5" - name="LabelOwnerTitle" - top_pad="10" - width="78"> - Owner: - </text> - <avatar_icon - follows="top|left" - height="20" - default_icon_name="Generic_Person" - layout="topleft" - left_pad="0" - top_delta="-6" - mouse_opaque="true" - width="20" /> - <text - type="string" - follows="left|right|top" - font="SansSerifSmall" - height="15" - layout="topleft" - left_pad="5" - name="LabelOwnerName" - top_delta="6" - width="140"> - </text> + Nicole Linden + </text> + <button + follows="top|right" + height="16" + image_selected="Inspector_I" + image_unselected="Inspector_I" + layout="topleft" + right="-5" + name="BtnCreator" + top_delta="-6" + width="16" /> + <text + type="string" + length="1" + follows="left|top" + height="23" + layout="topleft" + left="5" + name="LabelOwnerTitle" + top_pad="10" + width="78"> + Owner: + </text> + <avatar_icon + follows="top|left" + height="20" + default_icon_name="Generic_Person" + layout="topleft" + left_pad="0" + top_delta="-6" + mouse_opaque="true" + width="20" /> + <text + type="string" + follows="left|right|top" + font="SansSerifSmall" + height="15" + layout="topleft" + left_pad="5" + name="LabelOwnerName" + top_delta="6" + width="140"> + Thrax Linden + </text> <button follows="top|right" height="16" @@ -241,6 +234,7 @@ top_pad="10" name="LabelAcquiredDate" top_delta="0" width="222"> + Wed May 24 12:50:46 2006 </text> <panel border="false" @@ -399,7 +393,7 @@ top_pad="10" label_width="75" left="120" width="170" - min_val="0" + min_val="1" height="23" max_val="999999999" top_pad="10"/> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 048de70045..0c73b8d769 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -46,13 +46,6 @@ <string name="LoginWaitingForRegionHandshake">Waiting for region handshake...</string> <string name="LoginConnectingToRegion">Connecting to region...</string> <string name="LoginDownloadingClothing">Downloading clothing...</string> - <string name="InvalidCertificate">The server returned an invalid or corrupt certificate. Please contact the Grid administrator.</string> - <string name="CertInvalidHostname">An invalid hostname was used to access the server, please check your SLURL or Grid hostname.</string> - <string name="CertExpired">The certificate returned by the Grid appears to be expired. Please check your system clock, or contact your Grid administrator.</string> - <string name="CertKeyUsage">The certificate returned by the server could not be used for SSL. Please contact your Grid administrator.</string> - <string name="CertBasicConstraints">Too many certificates were in the servers Certificate chain. Please contact your Grid administrator.</string> - <string name="CertInvalidSignature">The certificate signature returned by the Grid server could not be verified. Please contact your Grid administrator.</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> @@ -67,7 +60,7 @@ <string name="SentToInvalidRegion">You were sent to an invalid region.</string> <string name="TestingDisconnect">Testing viewer disconnect</string> - <!-- Tooltip --> + <!-- Tooltip, lltooltipview.cpp --> <string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar --> <string name="TooltipNoName">(no name)</string> <!-- No name on an object --> <string name="TooltipOwner">Owner:</string> <!-- Owner name follows --> @@ -83,7 +76,6 @@ <string name="TooltipFlagNoScripts">No Scripts</string> <string name="TooltipLand">Land:</string> <string name="TooltipMustSingleDrop">Only a single item can be dragged here</string> - <string name="TooltipPrice" value="L$[AMOUNT]: "/> <!-- tooltips for Urls --> <string name="TooltipHttpUrl">Click to view this web page</string> @@ -104,6 +96,8 @@ <string name="TooltipMapUrl">Click to view this location on a map</string> <string name="TooltipSLAPP">Click to run the secondlife:// command</string> <string name="CurrentURL" value=" CurrentURL: [CurrentURL]" /> + <string name="TooltipPrice" value=" L$[PRICE]-" /> + <!-- text for SLURL labels --> <string name="SLurlLabelTeleport">Teleport to</string> @@ -120,7 +114,7 @@ <!-- ButtonToolTips, llfloater.cpp --> <string name="BUTTON_CLOSE_DARWIN">Close (⌘W)</string> <string name="BUTTON_CLOSE_WIN">Close (Ctrl+W)</string> - <string name="BUTTON_CLOSE_CHROME">Close</string> + <string name="BUTTON_CLOSE_CHROME">Close</string>> <string name="BUTTON_RESTORE">Restore</string> <string name="BUTTON_MINIMIZE">Minimize</string> <string name="BUTTON_TEAR_OFF">Tear Off</string> @@ -135,8 +129,7 @@ <string name="RetrievingData">Retrieving...</string> <string name="ReleaseNotes">Release Notes</string> - <!-- Always mark translate="false" for strings that are nothing but URLs, as they don't need translation. --> - <string name="RELEASE_NOTES_BASE_URL" translate="false">http://wiki.secondlife.com/wiki/Release_Notes/</string> + <string name="RELEASE_NOTES_BASE_URL">http://secondlife.com/app/releasenotes/</string> <!-- Indicates something is being loaded. Maybe should be merged with RetrievingData --> <string name="LoadingData">Loading...</string> @@ -155,8 +148,6 @@ <!-- Group name: text shown for LLUUID::null --> <string name="GroupNameNone">(none)</string> - <string name="AvalineCaller">Avaline Caller [ORDER]</string> - <!-- Asset errors. Used in llassetstorage.cpp, translation from error code to error message. --> <string name="AssetErrorNone">No error</string> <string name="AssetErrorRequestFailed">Asset request: failed</string> @@ -278,7 +269,6 @@ <!-- world map --> <string name="texture_loading">Loading...</string> <string name="worldmap_offline">Offline</string> - <string name="worldmap_item_tooltip_format">[AREA] m² L$[PRICE]</string> <string name="worldmap_results_none_found">None found.</string> <!-- animations uploading status codes --> @@ -319,10 +309,6 @@ <!-- For use when we do not have land type back from the server --> <string name="land_type_unknown">(unknown)</string> - <!-- For land type back from the simulator --> - <string name="Estate / Full Region">Estate / Full Region</string> - <string name="Mainland / Full Region">Mainland / Full Region</string> - <!-- File load/save dialogs --> <string name="all_files">All Files</string> <string name="sound_files">Sounds</string> @@ -1813,40 +1799,7 @@ Clears (deletes) the media and all params from the given face. <string name="skirt">Skirt</string> <string name="alpha">Alpha</string> <string name="tattoo">Tattoo</string> - <string name="invalid">invalid</string> - <string name="none">none</string> - - <!-- Not Worn Wearable Types --> - <string name="shirt_not_worn">Shirt not worn</string> - <string name="pants_not_worn">Pants not worn</string> - <string name="shoes_not_worn">Shoes not worn</string> - <string name="socks_not_worn">Socks not worn</string> - <string name="jacket_not_worn">Jacket not worn</string> - <string name="gloves_not_worn">Gloves not worn</string> - <string name="undershirt_not_worn">Undershirt not worn</string> - <string name="underpants_not_worn">Underpants not worn</string> - <string name="skirt_not_worn">Skirt not worn</string> - <string name="alpha_not_worn">Alpha not worn</string> - <string name="tattoo_not_worn">Tattoo not worn</string> - <string name="invalid_not_worn">invalid</string> - - <!-- Create new wearable of the specified type --> - <string name="create_new_shape">Create new shape</string> - <string name="create_new_skin">Create new skin</string> - <string name="create_new_hair">Create new hair</string> - <string name="create_new_eyes">Create new eyes</string> - <string name="create_new_shirt">Create new shirt</string> - <string name="create_new_pants">Create new pants</string> - <string name="create_new_shoes">Create new shoes</string> - <string name="create_new_socks">Create new socks</string> - <string name="create_new_jacket">Create new jacket</string> - <string name="create_new_gloves">Create new gloves</string> - <string name="create_new_undershirt">Create new undershirt</string> - <string name="create_new_underpants">Create new underpants</string> - <string name="create_new_skirt">Create new skirt</string> - <string name="create_new_alpha">Create new alpha</string> - <string name="create_new_tattoo">Create new tattoo</string> - <string name="create_new_invalid">invalid</string> + <string name="invalid">invalid</string> <!-- Wearable List--> <string name="NewWearable">New [WEARABLE_ITEM]</string> @@ -1887,8 +1840,7 @@ Clears (deletes) the media and all params from the given face. <string name="LeaveMouselook">Press ESC to return to World View</string> <!-- inventory --> - <string name="InventoryNoMatchingItems">Didn't find what you're looking for? Try [secondlife:///app/search/all/[SEARCH_TERM] Search].</string> - <string name="PlacesNoMatchingItems">Didn't find what you're looking for? Try [secondlife:///app/search/places/[SEARCH_TERM] Search].</string> + <string name="InventoryNoMatchingItems">No matching items found in inventory. Try [secondlife:///app/search/groups "Search"].</string> <string name="FavoritesNoMatchingItems">Drag a landmark here to add it to your favorites.</string> <string name="InventoryNoTexture">You do not have a copy of this texture in your inventory</string> <!-- use value="" because they have preceding spaces --> @@ -1914,10 +1866,8 @@ Clears (deletes) the media and all params from the given face. <string name="AnimFlagStop" value=" Stop Animation : " /> <string name="AnimFlagStart" value=" Start Animation : " /> <string name="Wave" value=" Wave " /> - <string name="GestureActionNone" value="None" /> <string name="HelloAvatar" value=" Hello, avatar! " /> <string name="ViewAllGestures" value=" View All >>" /> - <string name="GetMoreGestures" value=" Get More >>" /> <!-- inventory filter --> <!-- use value="" because they have preceding spaces --> @@ -1957,12 +1907,8 @@ Clears (deletes) the media and all params from the given face. <string name="InvFolder Uncompressed Sounds">Uncompressed Sounds</string> <string name="InvFolder Animations">Animations</string> <string name="InvFolder Gestures">Gestures</string> - <string name="InvFolder Favorite">Favorites</string> - <!-- historically default name of the Favorites folder can start from either "f" or "F" letter. - We should localize both of them with the same value --> <string name="InvFolder favorite">Favorites</string> <string name="InvFolder Current Outfit">Current Outfit</string> - <string name="InvFolder Initial Outfits">Initial Outfits</string> <string name="InvFolder My Outfits">My Outfits</string> <string name="InvFolder Accessories">Accessories</string> @@ -2103,7 +2049,6 @@ Clears (deletes) the media and all params from the given face. <string name="SummaryForTheWeek" value="Summary for this week, beginning on " /> <string name="NextStipendDay" value="The next stipend day is " /> <string name="GroupIndividualShare" value=" Group Individual Share" /> - <string name="GroupColumn" value=" Group" /> <string name="Balance">Balance</string> <string name="Credits">Credits</string> <string name="Debits">Debits</string> @@ -2182,7 +2127,6 @@ Clears (deletes) the media and all params from the given face. <string name="ATTACH_HUD_BOTTOM_LEFT">HUD Bottom Left</string> <string name="ATTACH_HUD_BOTTOM">HUD Bottom</string> <string name="ATTACH_HUD_BOTTOM_RIGHT">HUD Bottom Right</string> - <string name="Bad attachment point">Invalid Attachment Point</string> <!-- script editor --> <string name="CursorPos">Line [LINE], Column [COLUMN]</string> @@ -2195,23 +2139,22 @@ Clears (deletes) the media and all params from the given face. <string name="PanelDirEventsDateText">[mthnum,datetime,slt]/[day,datetime,slt]</string> <!-- panel contents --> + <string name="PanelContentsNewScript">New Script</string> <string name="PanelContentsTooltip">Content of object</string> - <string name="PanelContentsNewScript">New Script</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> <!-- Mute --> - <string name="MuteByName">(By name)</string> + <string name="MuteByName">(by name)</string> <string name="MuteAgent">(Resident)</string> - <string name="MuteObject">(Object)</string> - <string name="MuteGroup">(Group)</string> - <string name="MuteExternal">(External)</string> + <string name="MuteObject">(object)</string> + <string name="MuteGroup">(group)</string> <!-- Region/Estate Covenant --> <string name="RegionNoCovenant">There is no Covenant provided for this Estate.</string> <string name="RegionNoCovenantOtherOwner">There is no Covenant provided for this Estate. The land on this estate is being sold by the Estate owner, not Linden Lab. Please contact the Estate Owner for sales details.</string> - <string name="covenant_last_modified" value="Last Modified: " /> <!-- use value="" to keep the trailing space --> + <string name="covenant_last_modified">Last Modified:</string> <string name="none_text" value=" (none) " /> <string name="never_text" value=" (never) " /> @@ -2952,9 +2895,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="LocationCtrlBuildTooltip">Building/dropping objects not allowed</string> <string name="LocationCtrlScriptsTooltip">Scripts not allowed</string> <string name="LocationCtrlDamageTooltip">Health</string> - <string name="LocationCtrlAdultIconTooltip">Adult Region</string> - <string name="LocationCtrlModerateIconTooltip">Moderate Region</string> - <string name="LocationCtrlGeneralIconTooltip">General Region</string> <!-- Strings used by the (currently Linux) auto-updater app --> <string name="UpdaterWindowTitle"> @@ -2988,10 +2928,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Failed to start viewer </string> - <!-- System Messages --> - <string name="ItemsComingInTooFastFrom">[APP_NAME]: Items coming in too fast from [FROM_NAME], automatic preview disabled for [TIME] seconds</string> - <string name="ItemsComingInTooFast">[APP_NAME]: Items coming in too fast, automatic preview disabled for [TIME] seconds</string> - <!-- IM system messages --> <string name="IM_logging_string">-- Instant message logging enabled --</string> <string name="IM_typing_start_string">[NAME] is typing...</string> @@ -3004,10 +2940,8 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="IM_moderator_label">(Moderator)</string> <!-- voice calls --> - <string name="answered_call">Your call has been answered</string> - <string name="you_started_call">You started a voice call</string> - <string name="you_joined_call">You joined the voice call</string> - <string name="name_started_call">[NAME] started a voice call</string> + <string name="started_call">Started a voice call</string> + <string name="joined_call">Joined the voice call</string> <string name="ringing-im"> Joining voice call... @@ -3111,20 +3045,17 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. </string> <string name="unread_chat_single"> [SOURCES] has said something new - </string> + </string>" <string name="unread_chat_multiple"> [SOURCES] have said something new - </string> + </string>" <string name="session_initialization_timed_out_error"> The session initialization is timed out </string> - <string name="voice_morphing_url">http://secondlife.com/landing/voicemorphing</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_info">You paid L$[AMOUNT].</string> <string name="you_paid_ldollars_no_reason">You paid [NAME] L$[AMOUNT].</string> <string name="you_paid_ldollars_no_name">You paid L$[AMOUNT] [REASON].</string> <string name="for a parcel of land">for a parcel of land</string> @@ -3143,7 +3074,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="group_role_everyone">Everyone</string> <string name="group_role_officers">Officers</string> <string name="group_role_owners">Owners</string> - <string name="group_member_status_online">Online</string> <string name="uploading_abuse_report">Uploading... @@ -3166,93 +3096,7 @@ Abuse Report</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 Gesture">New Gesture</string> <string name="New Script">New Script</string> - <string name="New Note">New Note</string> <string name="New Folder">New Folder</string> <string name="Contents">Contents</string> - <string name="Gesture">Gesture</string> - <string name="Male Gestures">Male Gestures</string> - <string name="Female Gestures">Female Gestures</string> - <string name="Other Gestures">Other Gestures</string> - <string name="Speech Gestures">Speech Gestures</string> - <string name="Common Gestures">Common Gestures</string> - <!-- gestures --> - <string name="Male - Excuse me">Male - Excuse me</string> - <string name="Male - Get lost">Male - Get lost</string> - <string name="Male - Blow kiss">Male - Blow kiss</string> - <string name="Male - Boo">Male - Boo</string> - <string name="Male - Bored">Male - Bored</string> - <string name="Male - Hey">Male - Hey</string> - <string name="Male - Laugh">Male - Laugh</string> - <string name="Male - Repulsed">Male - Repulsed</string> - <string name="Male - Shrug">Male - Shrug</string> - <string name="Male - Stick tougue out">Male - Stick tougue out</string> - <string name="Male - Wow">Male - Wow</string> - - <string name="Female - Chuckle">Female - Chuckle</string> - <string name="Female - Cry">Female - Cry</string> - <string name="Female - Embarrassed">Female - Embarrassed</string> - <string name="Female - Excuse me">Female - Excuse me</string> - <string name="Female - Get lost">Female - Get lost</string> - <string name="Female - Blow kiss">Female - Blow kiss</string> - <string name="Female - Boo">Female - Boo</string> - <string name="Female - Bored">Female - Bored</string> - <string name="Female - Hey">Female - Hey</string> - <string name="Female - Hey baby">Female - Hey baby</string> - <string name="Female - Laugh">Female - Laugh</string> - <string name="Female - Looking good">Female - Looking good</string> - <string name="Female - Over here">Female - Over here</string> - <string name="Female - Please">Female - Please</string> - <string name="Female - Repulsed">Female - Repulsed</string> - <string name="Female - Shrug">Female - Shrug</string> - <string name="Female - Stick tougue out">Female - Stick tougue out</string> - <string name="Female - Wow">Female - Wow</string> - - <!-- birth date format shared by avatar inspector and profile panels --> - <string name="AvatarBirthDateFormat">[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]</string> - - <string name="DefaultMimeType">none/none</string> - <string name="texture_load_dimensions_error">Can't load images larger than [WIDTH]*[HEIGHT]</string> - - <!-- language specific white-space characters, delimiters, spacers, item separation symbols --> - <string name="sentences_separator" value=" "></string> - <string name="words_separator" value=", "/> - - <string name="server_is_down"> - Despite our best efforts, something unexpected has gone wrong. - - Please check status.secondlifegrid.net to see if there is a known problem with the service. - If you continue to experience problems, please check your network and firewall setup. - </string> - - <!-- overriding datetime formating. - didn't translate if this is not needed for current localization - --> - <string name="dateTimeWeekdaysNames">Sunday:Monday:Tuesday:Wednesday:Thursday:Friday:Saturday</string> - <string name="dateTimeWeekdaysShortNames">Sun:Mon:Tue:Wed:Thu:Fri:Sat</string> - <string name="dateTimeMonthNames">January:February:March:April:May:June:July:August:September:October:November:December</string> - <string name="dateTimeMonthShortNames">Jan:Feb:Mar:Apr:May:Jun:Jul:Aug:Sep:Oct:Nov:Dec</string> - <string name="dateTimeDayFormat">[MDAY]</string> - <string name="dateTimeAM">AM</string> - <string name="dateTimePM">PM</string> - - <!-- currency formatting --> - <string name="LocalEstimateUSD">US$ [AMOUNT]</string> - - <!-- Group Profile roles and powers --> - <string name="Membership">Membership</string> - <string name="Roles">Roles</string> - <string name="Group Identity">Group Identity</string> - <string name="Parcel Management">Parcel Management</string> - <string name="Parcel Identity">Parcel Identity</string> - <string name="Parcel Settings">Parcel Settings</string> - <string name="Parcel Powers">Parcel Powers</string> - <string name="Parcel Access">Parcel Access</string> - <string name="Parcel Content">Parcel Content</string> - <string name="Object Management">Object Management</string> - <string name="Accounting">Accounting</string> - <string name="Notices">Notices</string> - <string name="Chat">Chat</string> - - </strings> +</strings> diff --git a/indra/newview/skins/default/xui/en/widgets/expandable_text.xml b/indra/newview/skins/default/xui/en/widgets/expandable_text.xml index 216c4dea95..6190ea7872 100644 --- a/indra/newview/skins/default/xui/en/widgets/expandable_text.xml +++ b/indra/newview/skins/default/xui/en/widgets/expandable_text.xml @@ -11,7 +11,6 @@ read_only="true" use_ellipses="true" word_wrap="true" - show_context_menu="true" tab_stop="true" v_pad="3" h_pad="4" > diff --git a/indra/newview/skins/default/xui/en/widgets/text.xml b/indra/newview/skins/default/xui/en/widgets/text.xml index 3006df22b8..998ec5b170 100644 --- a/indra/newview/skins/default/xui/en/widgets/text.xml +++ b/indra/newview/skins/default/xui/en/widgets/text.xml @@ -6,6 +6,7 @@ font_shadow="none" tab_stop="false" halign="left" + hover_color="LabelSelectedColor" h_pad="0" allow_scroll="false" text_readonly_color="LabelDisabledColor" @@ -13,6 +14,7 @@ use_ellipses="false" bg_visible="false" border_visible="false" + hover="false" sound_flags="0" text_color="LabelTextColor" v_pad="0" |