diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en')
29 files changed, 523 insertions, 418 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_animation_preview.xml b/indra/newview/skins/default/xui/en/floater_animation_preview.xml index 26ace7b617..4f4288b654 100644 --- a/indra/newview/skins/default/xui/en/floater_animation_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_animation_preview.xml @@ -525,7 +525,7 @@ Maximum animation length is [MAX_LENGTH] seconds. We recommend BVH files exported from Poser 4. </text> <button - top="580" + top="580" follows="bottom|left" height="23" label="Upload (L$[AMOUNT])" @@ -534,7 +534,7 @@ We recommend BVH files exported from Poser 4. name="ok_btn" width="128" /> <button - top="580" + top="580" follows="bottom|left" height="23" label="Cancel" diff --git a/indra/newview/skins/default/xui/en/floater_lagmeter.xml b/indra/newview/skins/default/xui/en/floater_lagmeter.xml index 19f5155f88..b24c745bdd 100644 --- a/indra/newview/skins/default/xui/en/floater_lagmeter.xml +++ b/indra/newview/skins/default/xui/en/floater_lagmeter.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater legacy_header_height="18" - height="150" + height="170" layout="topleft" name="floater_lagmeter" help_topic="floater_lagmeter" @@ -328,7 +328,7 @@ left="10" name="minimize" tool_tip="Toggle floater size" - top_delta="4" + top_delta="24" width="40"> <button.commit_callback function="LagMeter.ClickShrink" /> diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml index c5d6f885d3..82e4d87b28 100644 --- a/indra/newview/skins/default/xui/en/floater_search.xml +++ b/indra/newview/skins/default/xui/en/floater_search.xml @@ -14,7 +14,7 @@ width="670"> <floater.string name="search_url"> - http://eniac21.lindenlab.com:10001/viewer + http://int.searchwww-phx0.damballah.lindenlab.com/viewer </floater.string> <floater.string name="loading_text"> diff --git a/indra/newview/skins/default/xui/en/floater_sys_well.xml b/indra/newview/skins/default/xui/en/floater_sys_well.xml index be6d63716c..3fc57372de 100644 --- a/indra/newview/skins/default/xui/en/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/en/floater_sys_well.xml @@ -6,20 +6,30 @@ top="0" follows="right|bottom" layout="topleft" - name="notification_chiclet" + name="sys_well_window" help_topic="notification_chiclet" save_rect="true" title="NOTIFICATIONS" width="320" min_width="320" height="23" - can_minimize="true" + can_minimize="false" can_tear_off="false" can_resize="true" can_drag_on_left="false" - can_close="false" can_dock="true" + save_visibility="true" + single_instance="true" > + <string + name="title_im_well_window"> + IM SESSIONS + </string> + <string + name="title_notification_well_window"> + NOTIFICATIONS + </string> + <flat_list_view color="FloaterDefaultBackgroundColor" follows="all" diff --git a/indra/newview/skins/default/xui/en/floater_water.xml b/indra/newview/skins/default/xui/en/floater_water.xml index b13a11c05d..89492d8abc 100644 --- a/indra/newview/skins/default/xui/en/floater_water.xml +++ b/indra/newview/skins/default/xui/en/floater_water.xml @@ -116,7 +116,7 @@ layout="topleft" left="10" name="WaterFogDensText" - top="74" + top="84" width="200"> Fog Density Exponent </text> @@ -130,7 +130,7 @@ left="24" max_val="10" name="WaterFogDensity" - top="110" + top="124" width="200" /> <text type="string" @@ -141,7 +141,7 @@ layout="topleft" left_delta="-14" name="WaterUnderWaterFogModText" - top_delta="4" + top="124" width="200"> Underwater Fog Modifier </text> @@ -155,7 +155,7 @@ left="24" max_val="2" name="WaterUnderWaterFogMod" - top="150" + top="164" width="200" /> <text type="string" @@ -180,7 +180,7 @@ layout="topleft" max_val="10" name="WaterNormalScaleX" - top_pad="20" + top_pad="24" width="200" /> <slider control_name="WaterNormalScaleY" @@ -192,7 +192,7 @@ layout="topleft" max_val="10" name="WaterNormalScaleY" - top_pad="0" + top_pad="4" width="200" /> <slider control_name="WaterNormalScaleZ" @@ -204,7 +204,7 @@ layout="topleft" max_val="10" name="WaterNormalScaleZ" - top_pad="0" + top_pad="4" width="200" /> <text type="string" @@ -214,7 +214,7 @@ height="16" layout="topleft" name="HDText" - top_pad="-10" + top="84" width="200"> Fresnel Scale </text> @@ -227,7 +227,7 @@ initial_value="0.7" layout="topleft" name="WaterFresnelScale" - top_pad="20" + top="124" width="200" /> <text type="string" @@ -237,7 +237,7 @@ height="16" layout="topleft" name="FresnelOffsetText" - top_pad="-10" + top="124" width="200"> Fresnel Offset </text> @@ -250,7 +250,7 @@ initial_value="0.7" layout="topleft" name="WaterFresnelOffset" - top_pad="20" + top="164" width="200" /> <text type="string" @@ -275,7 +275,7 @@ layout="topleft" left="494" name="WaterScaleAbove" - top="40" + top="44" width="200" /> <text type="string" @@ -286,7 +286,7 @@ layout="topleft" left_delta="-14" name="WaterScaleBelowText" - top_delta="-3" + top="44" width="200"> Refract Scale Below </text> @@ -300,7 +300,7 @@ layout="topleft" left="494" name="WaterScaleBelow" - top="73" + top="84" width="200" /> <text type="string" @@ -311,7 +311,7 @@ layout="topleft" left_delta="-14" name="MaxAltText" - top_delta="-2" + top="84" width="200"> Blur Multiplier </text> @@ -325,7 +325,7 @@ left="494" max_val="0.16" name="WaterBlurMult" - top="107" + top="124" width="200" /> </panel> <panel diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml index 9c11a88c34..e632b67d11 100644 --- a/indra/newview/skins/default/xui/en/floater_world_map.xml +++ b/indra/newview/skins/default/xui/en/floater_world_map.xml @@ -62,7 +62,7 @@ left="4" layout="topleft" name="Show My Location" - tool_tip="Center map on your avatar's location" + tool_tip="Center map on my avatar's location" top="6" width="24" > <button.commit_callback @@ -235,7 +235,7 @@ left="136" top="6" name="Go Home" - tool_tip="Teleport home" + tool_tip="Teleport to my home location" width="24" > <button.commit_callback function="WMap.GoHome" /> diff --git a/indra/newview/skins/default/xui/en/menu_avatar_icon.xml b/indra/newview/skins/default/xui/en/menu_avatar_icon.xml index df510d68eb..50910dff32 100644 --- a/indra/newview/skins/default/xui/en/menu_avatar_icon.xml +++ b/indra/newview/skins/default/xui/en/menu_avatar_icon.xml @@ -9,7 +9,7 @@ visible="false" width="128"> <menu_item_call - label="Show Profile..." + label="View Profile" layout="topleft" name="Show Profile"> <menu_item_call.on_click diff --git a/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml index 6891aaca32..038b8328cb 100644 --- a/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml +++ b/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml @@ -9,7 +9,7 @@ visible="false" width="128"> <menu_item_call - label="Show Profile" + label="View Profile" layout="topleft" name="Show Profile"> <menu_item_call.on_click diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml index a22dc80f4e..9b439c16e0 100644 --- a/indra/newview/skins/default/xui/en/menu_login.xml +++ b/indra/newview/skins/default/xui/en/menu_login.xml @@ -45,8 +45,7 @@ name="Second Life Help" shortcut="F1"> <menu_item_call.on_click - function="ShowFloater" - parameter="help f1" /> + function="ShowHelp" /> </menu_item_call> <menu_item_separator /> <menu_item_call diff --git a/indra/newview/skins/default/xui/en/menu_navbar.xml b/indra/newview/skins/default/xui/en/menu_navbar.xml index e17eeb46f6..b71b866c4b 100644 --- a/indra/newview/skins/default/xui/en/menu_navbar.xml +++ b/indra/newview/skins/default/xui/en/menu_navbar.xml @@ -27,6 +27,8 @@ <menu_item_check.on_check control="NavBarShowParcelProperties" /> </menu_item_check> + <menu_item_separator + name="Separator" /> <!-- Label of 'Landmark' item is changing in runtime, see AddLandmarkNavBarMenu/EditLandmarkNavBarMenu in strings.xml --> <menu_item_call diff --git a/indra/newview/skins/default/xui/en/menu_participant_list.xml b/indra/newview/skins/default/xui/en/menu_participant_list.xml index c3283c6014..5ab327a182 100644 --- a/indra/newview/skins/default/xui/en/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/en/menu_participant_list.xml @@ -2,6 +2,67 @@ <context_menu layout="topleft" name="Participant List Context Menu"> + <menu_item_call + label="View Profile" + layout="topleft" + name="View Profile"> + <menu_item_call.on_click + function="Avatar.Profile" /> + </menu_item_call> + <menu_item_call + label="Add Friend" + layout="topleft" + name="Add Friend"> + <menu_item_call.on_click + function="Avatar.AddFriend" /> + <menu_item_call.on_enable + function="Avatar.EnableItem" + parameter="can_add" /> + </menu_item_call> + <menu_item_call + label="IM" + layout="topleft" + name="IM"> + <menu_item_call.on_click + function="Avatar.IM" /> + </menu_item_call> + <menu_item_call + label="Call" + layout="topleft" + name="Call"> + <menu_item_call.on_click + function="Avatar.Call" /> + </menu_item_call> + <menu_item_call + enabled="false" + label="Share" + layout="topleft" + name="Share"> + <menu_item_call.on_click + function="Avatar.Share" /> + </menu_item_call> + <menu_item_call + label="Pay" + layout="topleft" + name="Pay"> + <menu_item_call.on_click + function="Avatar.Pay" /> + </menu_item_call> + <menu_item_check + label="Block/Unblock" + layout="topleft" + name="Block/Unblock"> + <menu_item_check.on_click + function="Avatar.BlockUnblock" /> + <menu_item_check.on_check + function="Avatar.CheckItem" + parameter="is_blocked" /> + <menu_item_check.on_enable + function="Avatar.EnableItem" + parameter="can_block" /> + </menu_item_check> + <menu_item_separator + layout="topleft" /> <menu_item_check label="Mute Text" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 38e5a28166..861b0de2cf 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -68,7 +68,7 @@ parameter="inventory" /> </menu_item_check> <menu_item_call - label="Show Sidetray Inventory" + label="Show Inventory in Side Tray" name="ShowSidetrayInventory" shortcut="control|I" visible="false"> @@ -433,6 +433,8 @@ </menu_item_check> <menu_item_separator layout="topleft" />--> + <menu_item_separator + layout="topleft" /> <menu_item_call label="Snapshot" layout="topleft" @@ -442,6 +444,8 @@ function="Floater.Show" parameter="snapshot" /> </menu_item_call> + <menu_item_separator + layout="topleft" /> <menu create_jump_keys="true" label="Sun" @@ -1060,8 +1064,7 @@ name="Second Life Help" shortcut="F1"> <menu_item_call.on_click - function="ShowFloater" - parameter="help f1" /> + function="ShowHelp" /> </menu_item_call> <menu_item_call label="Tutorial" @@ -1081,6 +1084,14 @@ function="ShowFloater" parameter="complaint reporter" /> </menu_item_call> + <menu_item_call + label="Report Bug" + layout="topleft" + name="Report Bug"> + <menu_item_call.on_click + function="ShowHelp" + parameter="report_bug" /> + </menu_item_call> <menu_item_separator layout="topleft" /> <menu_item_call diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index d8eb65322b..a07b23d0c3 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -1688,7 +1688,7 @@ This location can play streaming media. Streaming media requires a fast Internet connection. Play streaming media when available? -(You can change this option later under Preferences > Audio & Video.) +(You can change this option later under Preferences > Privacy.) <usetemplate name="okcancelbuttons" notext="Disable" @@ -4499,14 +4499,14 @@ You don't have permission to copy this. <notification icon="notifytip.tga" name="InventoryAccepted" - type="notifytip"> + type="offer"> [NAME] received your inventory offer. </notification> <notification icon="notifytip.tga" name="InventoryDeclined" - type="notifytip"> + type="offer"> [NAME] declined your inventory offer. </notification> @@ -5128,6 +5128,13 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you [O text="Decline"/> </form> </notification> + + <notification + icon="notify.tga" + name="FriendshipOffered" + type="offer"> + You have offered friendship to [TO_NAME] + </notification> <notification icon="notify.tga" diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index ec3f7ea7c5..7f847237ce 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -319,38 +319,82 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly. layout="topleft" min_height="28" top="0" - name="sys_well_panel" - width="54" - min_width="54" + name="im_well_panel" + width="34" + min_width="34" + user_resize="false"> + <chiclet_im_well + follows="right" + height="23" + layout="topleft" + left="0" + name="im_well" + top="4" + width="34"> + <button + auto_resize="true" + flash_color="EmphasisColor" + follows="right" + halign="center" + height="23" + image_overlay="Notices_Unread" + image_overlay_alignment="center" + image_pressed="PushButton_Press" + image_pressed_selected="PushButton_Selected_Press" + image_selected="PushButton_Selected_Press" + left="0" + name="Unread IM messages" + pad_left="0" + pad_right="0" + width="34" > + <button.init_callback + function="Button.SetDockableFloaterToggle" + parameter="im_well_window" /> + </button> + </chiclet_im_well> + </layout_panel> + <layout_panel + auto_resize="false" + follows="right" + height="28" + layout="topleft" + min_height="28" + top="0" + name="notification_well_panel" + width="34" + min_width="34" user_resize="false"> <chiclet_notification follows="right" height="23" layout="topleft" left="0" - name="sys_well" + name="notification_well" top="4" - width="54"> + width="34"> <button image_selected="PushButton_Selected_Press" image_pressed="PushButton_Press" image_pressed_selected="PushButton_Selected_Press" auto_resize="true" - halign="right" + halign="center" height="23" follows="right" flash_color="EmphasisColor" left="0" name="Unread" image_overlay="Notices_Unread" - image_overlay_alignment="right" - pad_right="6" - pad_left="6" - width="54" - /> + image_overlay_alignment="center" + pad_right="0" + pad_left="0" + width="34" > + <button.init_callback + function="Button.SetDockableFloaterToggle" + parameter="notification_well_window" /> + </button> </chiclet_notification> </layout_panel> - <icon + <icon auto_resize="false" color="0 0 0 0" follows="left|right" diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml index a833ad97d9..bbf86089cb 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml @@ -51,6 +51,10 @@ http://www.secondlife.com/account/partners.php?lang=en </string> <string + name="my_account_link_url"> + http://secondlife.com/my + </string> + <string name="no_partner_text" value="None" /> <scroll_container @@ -256,7 +260,7 @@ layout="topleft" left="10" name="my_account_link" - value="Go to My Dashboard" + value="[[URL] Go to My Dashboard]" width="285" /> <text follows="left|top|right" 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 0dea81eefe..1b70b95a93 100644 --- a/indra/newview/skins/default/xui/en/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml @@ -10,11 +10,9 @@ width="310"> <panel.string name="help_text"> - Notices let you send a message and -an optionally attached item. Notices only go to -group members in Roles with the ability to -receive Notices. You can turn off Notices on -the General tab. + Notices let you send a message and an optionally attached item. +Notices only go to group members in Roles with the ability to receive Notices. +You can turn off Notices on the General tab. </panel.string> <panel.string name="no_notices_text"> @@ -31,7 +29,7 @@ the General tab. name="lbl2" top="5" width="300"> - Notices are kept for 14 days + Notices are kept for 14 days. Maximum 200 per group daily </text> <scroll_list @@ -93,6 +91,7 @@ Maximum 200 per group daily layout="topleft" name="refresh_notices" right="-5" + tool_tip="Refresh list of notices" top_delta="0" width="23" /> <panel @@ -192,7 +191,7 @@ Maximum 200 per group daily top_pad="15" word_wrap="true" width="150"> - Drag here to attach something -- > + Drag and drop item here to attach it: </text> <icon height="72" @@ -228,7 +227,7 @@ Maximum 200 per group daily left="10" layout="topleft" name="drop_target" - tool_tip="Drag an inventory item onto the message box to send it with the notice. You must have permission to copy and transfer the object to send it with the notice." + tool_tip="Drag an inventory item onto this target box to send it with this notice. You must have permission to copy and transfer the item in order to attach it." width="280" /> </panel> <panel diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml index 5bae5c2711..9548119d58 100644 --- a/indra/newview/skins/default/xui/en/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml @@ -258,7 +258,7 @@ things in this group. There's a broad variety of Abilities. name="static" top_pad="5" width="300"> - Assigned Roles + Assigned Members </text> <scroll_list draw_stripes="true" @@ -367,7 +367,7 @@ things in this group. There's a broad variety of Abilities. <text_editor type="string" halign="left" - height="50" + height="35" layout="topleft" left="0" max_length="295" @@ -426,6 +426,10 @@ things in this group. There's a broad variety of Abilities. width="300"> <scroll_list.columns label="" + name="icon" + width="2" /> + <scroll_list.columns + label="" name="checkbox" width="20" /> <scroll_list.columns diff --git a/indra/newview/skins/default/xui/en/panel_instant_message.xml b/indra/newview/skins/default/xui/en/panel_instant_message.xml index 1e570bf207..ccd754ac5e 100644 --- a/indra/newview/skins/default/xui/en/panel_instant_message.xml +++ b/indra/newview/skins/default/xui/en/panel_instant_message.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel background_visible="true" - height="175" + height="152" label="im_panel" layout="topleft" left="0" @@ -83,13 +83,4 @@ width="285" word_wrap="true" max_length="350" /> - <button - follows="bottom" - height="23" - label="Reply" - layout="topleft" - left="100" - name="reply" - top="144" - width="100" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index 8b5c149f0d..c9db75b5d8 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -1,216 +1,212 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - follows="all" - height="600" - layout="topleft" - left="0" - name="panel_login" - top="600" +follows="all" +height="600" +layout="topleft" +left="0" +name="panel_login" +top="600" width="996"> - <panel.string +<panel.string name="create_account_url"> - http://join.secondlife.com/ - </panel.string> - <panel.string + http://join.secondlife.com/ +</panel.string> +<panel.string name="real_url"> - http://secondlife.com/app/login/ - </panel.string> + http://secondlife.com/app/login/ +</panel.string> <string name="reg_in_client_url"> - http://secondlife.eniac15.lindenlab.com/reg-in-client/ - </string> - <panel.string + http://secondlife.eniac15.lindenlab.com/reg-in-client/ +</string> +<panel.string name="forgot_password_url"> - http://secondlife.com/account/request.php - </panel.string> - <!-- *NOTE: Custom resize logic for login_html in llpanellogin.cpp --> - <web_browser - border_visible="false" - bottom="600" - follows="all" - hide_loading="true" - left="0" - name="login_html" - start_url="" - top="0" - height="600" + http://secondlife.com/account/request.php +</panel.string> +<!-- *NOTE: Custom resize logic for login_html in llpanellogin.cpp --> +<web_browser +border_visible="false" +bottom="600" +follows="all" +hide_loading="true" +left="0" +name="login_html" +start_url="" +top="0" +height="600" width="996" /> - <panel - follows="left|bottom|right" - name="login_widgets" - layout="topleft" - top="519" - width="996" +<panel +follows="left|bottom|right" +name="login_widgets" +layout="topleft" +top="519" +width="996" height="80"> - <text - follows="left|bottom" - font="SansSerifSmall" - height="16" - left="20" - name="first_name_text" - top="20" - width="150"> - First name: - </text> - <line_editor - follows="left|bottom" - handle_edit_keys_directly="true" - height="22" - label="First" - left_delta="0" - max_length="31" - name="first_name_edit" - select_on_focus="true" - tool_tip="[SECOND_LIFE] First Name" - top_pad="0" - 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" - handle_edit_keys_directly="true" - 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" - height="15" - left_pad="8" - name="password_text" - top="20" - width="150"> - Password: - </text> - <line_editor - follows="left|bottom" - handle_edit_keys_directly="true" - height="22" - max_length="16" - name="password_edit" - select_on_focus="true" - top_pad="0" - width="135" /> - <check_box - control_name="RememberPassword" - follows="left|bottom" - font="SansSerifSmall" - height="16" - label="Remember" - top_pad="3" - name="remember_check" - width="135" /> - <text - follows="left|bottom" - font="SansSerifSmall" - height="15" - left_pad="8" - name="start_location_text" - top="20" - width="130"> - Start at: - </text> - <combo_box - allow_text_entry="true" - control_name="LoginLocation" - follows="left|bottom" - height="23" - max_chars="128" - top_pad="0" - name="start_location_combo" +<text +follows="left|bottom" +font="SansSerifSmall" +height="16" +left="20" +name="first_name_text" +top="20" +width="150"> +First name: +</text> +<line_editor +follows="left|bottom" +handle_edit_keys_directly="true" +height="22" +label="First" +left_delta="0" +max_length="31" +name="first_name_edit" +select_on_focus="true" +tool_tip="[SECOND_LIFE] First Name" +top_pad="0" + 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" +handle_edit_keys_directly="true" +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" +height="15" +left_pad="8" +name="password_text" +top="20" + width="150"> + Password: +</text> +<line_editor +follows="left|bottom" +handle_edit_keys_directly="true" + height="22" + max_length="16" +name="password_edit" +select_on_focus="true" + top_pad="0" + width="135" /> + <check_box +control_name="RememberPassword" +follows="left|bottom" +font="SansSerifSmall" +height="16" +label="Remember" + top_pad="3" + name="remember_check" + width="135" /> + <text + follows="left|bottom" + font="SansSerifSmall" + height="15" + left_pad="8" + name="start_location_text" +top="20" + width="130"> + Start at: + </text> +<combo_box +allow_text_entry="true" +control_name="LoginLocation" + follows="left|bottom" + height="23" +max_chars="128" +top_pad="0" +name="start_location_combo" width="135"> - <combo_box.item - label="My last location" - name="MyLastLocation" +<combo_box.item +label="My last location" +name="MyLastLocation" value="last" /> - <combo_box.item - label="My home" - name="MyHome" +<combo_box.item +label="My home" +name="MyHome" value="home" /> - <combo_box.item - label="<Type region name>" - name="Typeregionname" - value="" /> - </combo_box> - <combo_box - allow_text_entry="true" - font="SansSerifSmall" - follows="left|bottom" - height="23" - layout="topleft" - top_pad="2" - name="server_combo" - width="135" - visible="false" /> - <button - follows="left|bottom" - height="23" - image_unselected="PushButton_On" - image_selected="PushButton_On_Selected" - label="Log In" - label_color="White" - layout="topleft" - left_pad="15" - name="connect_btn" - top="35" - width="90" /> - <text - follows="right|bottom" - font="SansSerifSmall" - text_color="EmphasisColor" - halign="right" - height="16" - top="12" - left_pad="5" - right="-10" - name="create_new_account_text" - width="180"> - Sign up - </text> - <text - follows="right|bottom" - font="SansSerifSmall" - text_color="EmphasisColor" - halign="right" - height="16" - name="forgot_password_text" - top_pad="12" - width="180"> - Forgot your name or password? - </text> - <text - follows="right|bottom" - font="SansSerifSmall" - text_color="EmphasisColor" - halign="right" - height="16" - name="login_help" - top_pad="2" - width="180"> - Need help? - </text> - <!-- <text - follows="right|bottom" - font="SansSerifSmall" - halign="right" - height="28" - top_pad="2" - name="channel_text" - width="180" - word_wrap="true"> - [VERSION] - </text>--> - </panel> +<combo_box.item +label="<Type region name>" +name="Typeregionname" value="" /> +</combo_box> +<combo_box +allow_text_entry="true" +font="SansSerifSmall" + follows="left|bottom" + height="23" +layout="topleft" +top_pad="2" +name="server_combo" +width="135" + visible="false" /> +<button + follows="left|bottom" + height="23" + image_unselected="PushButton_On" + image_selected="PushButton_On_Selected" + label="Log In" + label_color="White" + layout="topleft" + left_pad="15" + name="connect_btn" + top="35" + width="90" /> + <text +follows="right|bottom" +font="SansSerifSmall" +text_color="EmphasisColor" +halign="right" +height="16" +top="12" +left_pad="5" +right="-10" +name="create_new_account_text" + width="180"> + Sign up + </text> +<text +follows="right|bottom" +font="SansSerifSmall" +text_color="EmphasisColor" +halign="right" +height="16" +name="forgot_password_text" top_pad="12" + width="180"> + Forgot your name or password? +</text> +<text +follows="right|bottom" +font="SansSerifSmall" +text_color="EmphasisColor" +halign="right" +height="16" +name="login_help" +top_pad="2" + width="180"> + Need help logging in? </text> +<!-- <text + follows="right|bottom" + font="SansSerifSmall" + halign="right" + height="28" + top_pad="2" + name="channel_text" + width="180" + word_wrap="true"> + [VERSION] + </text>--> +</panel> </panel> 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 0fc87edc44..812801abc9 100644 --- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml @@ -16,21 +16,23 @@ <filter_editor text_pad_left="14" follows="left|top|right" - height="23" + height="23" label="Filter" layout="topleft" left="15" - max_length="300" +max_length="300" name="inventory search editor" top="26" width="303" /> <tab_container - follows="all" - halign="center" +follows="all" +halign="center" height="300" layout="topleft" left_delta="-4" name="inventory filter tabs" + tab_min_width="70" + tab_height="30" tab_position="top" tab_height="30" tab_min_width="100" @@ -107,7 +109,7 @@ width="18" /> </panel> -<menu_bar + <menu_bar bg_visible="false" follows="left|top|right" height="20" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml index 214e39614e..854227619b 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml @@ -23,7 +23,7 @@ name="System Volume" show_text="false" slider_label.halign="right" - top_pad="5" + top="10" volume="true" width="350"> <slider.commit_callback @@ -230,12 +230,13 @@ width="22" /> <check_box label_text.halign="left" - follows="right|top" - height="16" - control_name ="EnableVoiceChat" - disabled_control="CmdLineDisableVoice" - label="Voice" - left="50" + follows="left|top" + height="16" + control_name ="EnableVoiceChat" + disabled_control="CmdLineDisableVoice" + label="Enable voice" + layout="topleft" + left="28" name="enable_voice_check" top_pad="5" width="110" @@ -249,15 +250,16 @@ height="15" increment="0.05" initial_value="0.5" - label_width="0" + label="Voice" + label_width="160" layout="topleft" - left="165" - top_delta="0" + left="0" + top_delta="20" name="Voice Volume" show_text="false" slider_label.halign="right" volume="true" - width="185"> + width="350"> <slider.commit_callback function="Pref.setControlFalse" parameter="MuteVoice" /> @@ -283,63 +285,70 @@ follows="left|top" height="13" layout="topleft" - left="170" + left="30" name="Listen from" - width="200"> + width="200" + top="205"> Listen from: </text> <icon - follows="left" + follows="left|top" height="18" image_name="Cam_FreeCam_Off" + layout="topleft" name="camera_icon" mouse_opaque="false" visible="true" - width="18" /> + width="18" + left="80" + top="219"/> <icon - follows="left" + follows="left|top" height="18" image_name="Move_Walk_Off" + layout="topleft" name="avatar_icon" mouse_opaque="false" visible="true" - width="18" /> + width="18" + top="239" + left="80" + /> <radio_group enabled_control="EnableVoiceChat" control_name="VoiceEarLocation" draw_border="false" - follows="left" - left_delta="20" - top = "210" - width="221" - height="38" - name="ear_location"> - <radio_item - height="16" - label="Camera position" - left_pad="1" - follows="topleft" - name="0" - top_delta="-30" - width="200" /> - <radio_item - height="16" - follows="topleft" - label="Avatar position" - left_delta="0" - name="1" - top_delta="19" - width="200" /> - </radio_group> + follows="left|top" + layout="topleft" + left="100" + width="221" + height="38" + name="ear_location" + top="218"> + <radio_item + height="16" + label="Camera position" + follows="left|top" + layout="topleft" + name="0" + width="200"/> + <radio_item + height="16" + follows="left|top" + label="Avatar position" + layout="topleft" + name="1" + width="200" /> + </radio_group> <button control_name="ShowDeviceSettings" - follows="left|bottom" + follows="left|top" height="19" is_toggle="true" - label="Input/Output Devices" + label="Input/Output devices" layout="topleft" - left="165" - top_pad="12" + left="30" + top="270" name="device_settings_btn" width="190"> </button> diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml index 605058825e..1dd4eb095c 100644 --- a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml +++ b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml @@ -20,57 +20,7 @@ top_pad="10" width="313"> <layout_panel - auto_resize="false" - height="20" - layout="topleft" - left="0" - name="nav_controls" - top="0" - user_resize="false" - width="313"> - <button - enabled="false" - follows="left|top" - height="18" - image_overlay="Arrow_Left_Off" - layout="topleft" - tab_stop="false" - left="0" - name="back" - tool_tip="Back" - width="25" > - <button.commit_callback - function="MediaBrowser.Back" /> - </button> - <button - follows="left|top" - height="18" - enabled="false" - image_overlay="Arrow_Right_Off" - layout="topleft" - left_pad="3" - name="forward" - tool_tip="Forward" - width="25"> - <button.commit_callback - function="MediaBrowser.Forward" /> - </button> - - <button - follows="left|top" - height="18" - image_overlay="Home_Press" - layout="topleft" - left_pad="20" - tab_stop="false" - name="home" - width="25"> - <button.commit_callback - function="MediaBrowser.Home" /> - </button> - </layout_panel> - <layout_panel - height="530" + height="550" layout="topleft" left_delta="0" name="browser_layout" @@ -79,7 +29,7 @@ <web_browser border_visible="false" follows="all" - height="530" + height="550" layout="topleft" left="0" name="browser" diff --git a/indra/newview/skins/default/xui/en/role_actions.xml b/indra/newview/skins/default/xui/en/role_actions.xml index b89a975430..a6036f8b78 100644 --- a/indra/newview/skins/default/xui/en/role_actions.xml +++ b/indra/newview/skins/default/xui/en/role_actions.xml @@ -4,39 +4,39 @@ description="These Abilities include powers to add and remove group Members, and allow new Members to join without an invitation." name="Membership"> <action description="Invite People to this Group" - longdescription="Invite People to this Group using the 'Invite New Person...' button in the Members & Roles tab > Members sub-tab." + longdescription="Invite People to this Group using the 'Invite' button in the Roles section > Members tab." name="member invite" value="1" /> <action description="Eject Members from this Group" - longdescription="Eject Members from this Group using the 'Eject From Group' button in the Members & Roles tab > Members sub-tab. An Owner can eject anyone except another Owner. If you're not an Owner, a Member can be ejected from a group if, and only if, they're only in the Everyone Role, and NO other Roles. To remove Members from Roles, you need to have the 'Remove Members from Roles' Ability." + longdescription="Eject Members from this Group using the 'Eject' button in the Roles section > Members tab. An Owner can eject anyone except another Owner. If you're not an Owner, a Member can be ejected from a group if, and only if, they're only in the Everyone Role, and NO other Roles. To remove Members from Roles, you need to have the 'Remove Members from Roles' Ability." name="member eject" value="2" /> <action - description="Toggle 'Open Enrollment' and change 'Signup Fee'" - longdescription="Toggle 'Open Enrollment' to let new Members join without an invitation, and change 'Signup Fee' in the Group Preferences section of the General tab." + description="Toggle 'Open Enrollment' and change 'Enrollment fee'" + longdescription="Toggle 'Open Enrollment' to let new Members join without an invitation, and change the 'Enrollment fee' in the General section." name="member options" value="3" /> </action_set> <action_set description="These Abilities include powers to add, remove, and change group Roles, add and remove Members in Roles, and assign Abilities to Roles." name="Roles"> <action description="Create new Roles" - longdescription="Create new Roles in the Members & Roles tab > Roles sub-tab." + longdescription="Create new Roles in the Roles section > Roles tab." name="role create" value="4" /> <action description="Delete Roles" - longdescription="Delete Roles in the Members & Roles tab > Roles sub-tab." + longdescription="Delete Roles in the Roles section > Roles tab." name="role delete" value="5" /> - <action description="Change Role names, titles, descriptions, and whether Role members are publicly visible" - longdescription="Change Role names, titles, descriptions, and whether Role members are publicly visible. This is done at the bottom of the the Members & Roles tab > Roles sub-tab after selecting a Role." + <action description="Change Role names, titles, descriptions, and whether Role members are publicly revealed" + longdescription="Change Role names, titles, descriptions, and whether Role members are publicly revealed. This is done at the bottom of the the Roles section > Roles tab after selecting a Role." name="role properties" value="6" /> <action description="Assign Members to Assigner's Roles" - longdescription="Assign Members to Roles in the Assigned Roles section of the Members & Roles tab > Members sub-tab. A Member with this Ability can only add Members to a Role the assigner is already in." + longdescription="Assign Members to Roles in the list of Assigned Roles (Roles section > Members tab). A Member with this Ability can only add Members to a Role that the assigner is already in." name="role assign member limited" value="7" /> <action description="Assign Members to Any Role" - longdescription="Assign Members to Any Role in the Assigned Roles section of the Members & Roles tab > Members sub-tab. *WARNING* Any Member in a Role with this Ability can assign themselves--and any other non-Owner Member--to Roles that have more powers than they currently have, potentially elevating themselves to near-Owner power. Be sure you know what you're doing before assigning this Ability." + longdescription="Assign Members to Any Role in the list of Assigned Roles (Roles section > Members tab). *WARNING* Any Member in a Role with this Ability can assign themselves--and any other non-Owner Member--to Roles that have more powers than they currently have, potentially elevating themselves to near-Owner power. Be sure you know what you're doing before assigning this Ability." name="role assign member" value="8" /> <action description="Remove Members from Roles" - longdescription="Remove Members from Roles in the Assigned Roles section of the Members & Roles tab > Members sub-tab. Owners can't be removed." + longdescription="Remove Members from Roles in the list of Assigned Roles (Roles section > Members tab). Owners can't be removed." name="role remove member" value="9" /> <action description="Assign and Remove Abilities in Roles" - longdescription="Assign and Remove Abilities in Roles in the Allowed Abilities section of the Members & Roles tab > Roles sub-tab. *WARNING* Any Member in a Role with this Ability can assign themselves--and any other non-Owner Member--all Abilities, potentially elevating themselves to near-Owner power. Be sure you know what you're doing before assigning this Ability." + longdescription="Assign and Remove Abilities for each Role in the list of Allowed Abilities (Roles section > Roles tab). *WARNING* Any Member in a Role with this Ability can assign themselves--and any other non-Owner Member--all Abilities, potentially elevating themselves to near-Owner power. Be sure you know what you're doing before assigning this Ability." name="role change actions" value="10" /> </action_set> <action_set @@ -44,11 +44,11 @@ name="Group Identity"> <action description="Change Charter, Insignia, and 'Show in search'" - longdescription="Change Charter, Insignia, and 'Show in search'. This is done in the General tab." + longdescription="Change Charter, Insignia, and 'Show in search'. This is done in the General section." name="group change identity" value="11" /> </action_set> <action_set - description="These Abilities include powers to deed, modify, and sell land in this group's land holdings. To get to the About Land window, right-click the ground and select 'About Land...', or click the parcel info in the menu bar." + description="These Abilities include powers to deed, modify, and sell land in this group's land holdings. To get to the About Land window, right-click the ground and select 'About Land', or click the 'i' icon in the Navigation Bar." name="Parcel Management"> <action description="Deed land and buy land for group" longdescription="Deed land and buy land for group. This is done in About Land > General tab." @@ -60,18 +60,18 @@ longdescription="Set land for sale info. *WARNING* Any Member in a Role with this Ability can sell group-owned land in About Land > General tab as they wish! Be sure you know what you're doing before assigning this Ability." name="land set sale info" value="14" /> <action description="Subdivide and join parcels" - longdescription="Subdivide and join parcels. This is done by right-clicking the ground, 'Edit Terrain', and dragging your mouse on the land to make a selection. To subdivide, select what you want to split and click 'Subdivide...'. To join, select two or more contiguous parcels and click 'Join...'. " + longdescription="Subdivide and join parcels. This is done by right-clicking the ground, 'Edit Terrain', and dragging your mouse on the land to make a selection. To subdivide, select what you want to split and click 'Subdivide'. To join, select two or more contiguous parcels and click 'Join'. " name="land divide join" value="15" /> </action_set> <action_set description="These Abilities include powers to change the parcel name and publish settings, Find directory visibility, and landing point & TP routing options." name="Parcel Identity"> - <action description="Toggle 'Show in Find Places' and set category" - longdescription="Toggle 'Show in Find Places' and setting a parcel's category in About Land > Options tab." + <action description="Toggle 'Show Place in Search' and set category" + longdescription="Toggle 'Show Place in Search' and setting a parcel's category in About Land > Options tab." name="land find places" value="17" /> <action - description="Change parcel name, description, and 'Show in search' settings" - longdescription="Change parcel name, description, and 'Show in search' settings. This is done in About Land > Options tab." + description="Change parcel name, description, and 'Show Place in Search' settings" + longdescription="Change parcel name, description, and 'Show Place in Search' settings. This is done in About Land > Options tab." name="land change identity" value="18" /> <action description="Set landing point and set teleport routing" longdescription="On a group-owned parcel, Members in a Role with this Ability can set a landing point to specify where incoming teleports arrive, and also set teleport routing for further control. This is done in About Land > Options tab." @@ -87,7 +87,7 @@ longdescription="Toggle 'Edit Terrain'. *WARNING* About Land > Options tab > Edit Terrain allows anyone to terraform your land's shape, and place and move Linden plants. Be sure you know what you're doing before assigning this Ability. Editing terrain is toggled in About Land > Options tab." name="land edit" value="21" /> <action description="Toggle various About Land > Options settings" - longdescription="Toggle 'Safe (no damage)', 'Fly', and allow other Residents to: 'Create Objects', 'Edit Terrain', 'Create Landmarks', and 'Run Scripts' on group-owned land in About Land > Options tab." + longdescription="Toggle 'Safe (no damage)', 'Fly', and allow other Residents to: 'Edit Terrain', 'Build', 'Create Landmarks', and 'Run Scripts' on group-owned land in About Land > Options tab." name="land options" value="22" /> </action_set> <action_set @@ -106,7 +106,7 @@ longdescription="Members in a Role with this Ability can landmark a group-owned parcel, even if it's turned off in About Land > Options tab." name="land allow landmark" value="26" /> <action description="Allow 'Set Home to Here' on group land" - longdescription="Members in a Role with this Ability can use World menu > Set Home to Here on a parcel deeded to this group." + longdescription="Members in a Role with this Ability can use World menu > Landmarks > Set Home to Here on a parcel deeded to this group." name="land allow set home" value="28" /> </action_set> <action_set @@ -116,13 +116,13 @@ longdescription="Manage parcel Access lists in About Land > Access tab." name="land manage allowed" value="29" /> <action description="Manage parcel Ban lists" - longdescription="Manage parcel Ban lists in About Land > Ban tab." + longdescription="Manage parcel Ban lists in About Land > Access tab." name="land manage banned" value="30" /> - <action description="Change parcel 'Sell passes...' settings" - longdescription="Change parcel 'Sell passes...' settings in About Land > Access tab." + <action description="Change parcel 'Sell passes to' settings" + longdescription="Change parcel 'Sell passes to' settings in About Land > Access tab." name="land manage passes" value="31" /> <action description="Eject and freeze Residents on parcels" - longdescription="Members in a Role with this Ability can handle an unwelcome Resident on a group-owned parcel by right-clicking them, More >, and selecting 'Eject...' or 'Freeze...'." + longdescription="Members in a Role with this Ability can handle an unwelcome Resident on a group-owned parcel by right-clicking them, then selecting 'Eject' or 'Freeze'." name="land admin" value="32" /> </action_set> <action_set @@ -138,20 +138,20 @@ longdescription="Return objects on group-owned parcels that are non-group in About Land > Objects tab." name="land return non group" value="34" /> <action description="Landscaping using Linden plants" - longdescription="Landscaping ability to place and move Linden trees, plants, and grasses. These items can be found in your inventory's Library > Objects folder or they can be created via the Build button." + longdescription="Landscaping ability to place and move Linden trees, plants, and grasses. These items can be found in your inventory's Library > Objects folder, or they can be created via the Build menu." name="land gardening" value="35" /> </action_set> <action_set - description="These Abilities include powers to deed, modify, and sell group-owned objects. These changes are done in the Edit Tools > General Tab. Right-click an object and Edit to see its settings. " + description="These Abilities include powers to deed, modify, and sell group-owned objects. These changes are done in the Build Tools > General tab. Right-click an object and Edit to see its settings. " name="Object Management"> <action description="Deed objects to group" - longdescription="Deed objects to group in the Edit Tools > General Tab." + longdescription="Deed objects to group in the Build Tools > General tab." name="object deed" value="36" /> <action description="Manipulate (move, copy, modify) group-owned objects" - longdescription="Manipulate (move, copy, modify) group-owned objects in the Edit Tools > General Tab." + longdescription="Manipulate (move, copy, modify) group-owned objects in the Build Tools > General tab." name="object manipulate" value="38" /> <action description="Set group-owned objects for sale" - longdescription="Set group-owned objects for sale in the Edit Tools > General tab." + longdescription="Set group-owned objects for sale in the Build Tools > General tab." name="object set sale" value="39" /> </action_set> <action_set @@ -165,10 +165,10 @@ description="These Abilities include powers to allow Members to send, receive, and view group Notices." name="Notices"> <action description="Send Notices" - longdescription="Members in a Role with this Ability can send Notices in Group Information > Notices tab." + longdescription="Members in a Role with this Ability can send Notices via the Group > Notices section." name="notices send" value="42" /> <action description="Receive Notices and view past Notices" - longdescription="Members in a Role with this Ability can receive Notices and view past Notices in Group Information > Notices tab." + longdescription="Members in a Role with this Ability can receive Notices and view past Notices in Group > Notices section." name="notices receive" value="43" /> </action_set> <action_set diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index b014b8d1c0..7fafa63e57 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -88,7 +88,6 @@ <string name="BUTTON_MINIMIZE">Minimize</string> <string name="BUTTON_TEAR_OFF">Tear Off</string> <string name="BUTTON_DOCK">Dock</string> - <string name="BUTTON_UNDOCK">Undock</string> <string name="BUTTON_HELP">Show Help</string> <!-- searching - generic --> @@ -1771,7 +1770,8 @@ Clears (deletes) the media and all params from the given face. <string name="tattoo">Tattoo</string> <string name="invalid">invalid</string> - <!-- notify --> + <!-- LLGroupNotify --> + <!-- used in the construction of a Group Notice blue dialog box, buttons, tooltip etc. Seems to be no longer utilized by code in Viewer 2.0 --> <string name="next">Next</string> <string name="ok">OK</string> <string name="GroupNotifyGroupNotice">Group Notice</string> @@ -1781,6 +1781,7 @@ Clears (deletes) the media and all params from the given face. <string name="GroupNotifyViewPastNotices">View past notices or opt-out of receiving these messages here.</string> <string name="GroupNotifyOpenAttachment">Open Attachment</string> <string name="GroupNotifySaveAttachment">Save Attachment</string> + <string name="TeleportOffer">Teleport offering</string> <!-- start-up toast's string--> <string name="StartUpNotifications">New notifications arrived while you were away.</string> @@ -1882,6 +1883,7 @@ this texture in your inventory <string name="InvFolder All">All</string> <!-- inventory FVBridge --> + <!-- This is used in llpanelinventory.cpp when constructing a context menu for an item for Sale --> <string name="Buy">Buy</string> <string name="BuyforL$">Buy for L$</string> @@ -2008,8 +2010,8 @@ this texture in your inventory <!-- groups --> <string name="GroupsNone">none</string> - <string name="Group" value=" (group)" /> - <string name="Unknown">(Unknown)</string> + <string name="Group" value=" (group)" /> + <string name="Unknown">(Unknown)</string> <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" /> @@ -2019,7 +2021,8 @@ this texture in your inventory <string name="Total">Total</string> <string name="NoGroupDataFound">No group data found for group </string> - <!-- floater IM --> + <!-- floater IM bonus_info: When a Linden with Admin/god status receives a new IM this displays the estate (Mainland vs. teen grid) of the source avatar. + This is to help Lindens when answering questions. --> <string name="IMParentEstate">parent estate</string> <string name="IMMainland">mainland</string> <string name="IMTeen">teen</string> @@ -2108,8 +2111,8 @@ this texture in your inventory Unknown file extension .%s Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh </string> - <string name="AddLandmarkNavBarMenu">Add Landmark...</string> - <string name="EditLandmarkNavBarMenu">Edit Landmark...</string> + <string name="AddLandmarkNavBarMenu">Add to My Landmarks...</string> + <string name="EditLandmarkNavBarMenu">Edit my Landmark...</string> <!-- menu accelerators --> <string name="accel-mac-control">⌃</string> @@ -2388,8 +2391,8 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Eyes Bugged">Eyes Bugged</string> -<string name="Eyes Shear Left Up">Eyes Shear Left Up</string> -<string name="Eyes Shear Right Up">Eyes Shear Right Up</string> + + @@ -2780,7 +2783,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <!-- Navigation bar location input control. Strings are here because widget xml is not localizable --> <string name="LocationCtrlAddLandmarkTooltip">Add to My Landmarks</string> - <string name="LocationCtrlEditLandmarkTooltip">Edit My Landmark</string> + <string name="LocationCtrlEditLandmarkTooltip">Edit my Landmark</string> <string name="LocationCtrlInfoBtnTooltip">See more info about the current location</string> <string name="LocationCtrlComboBtnTooltip">My location history</string> <string name="LocationCtrlForSaleTooltip">Buy this land</string> diff --git a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml index 0e34243349..48baa2812d 100644 --- a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml @@ -4,6 +4,7 @@ search_button_visible="true" text_pad_left="7" select_on_focus="true" + text_tentative_color="TextFgTentativeColor" background_image="TextField_Search_Off" background_image_disabled="TextField_Search_Disabled" background_image_focused="TextField_Search_Active"> diff --git a/indra/newview/skins/default/xui/en/widgets/floater.xml b/indra/newview/skins/default/xui/en/widgets/floater.xml index b2bd9c38c9..19fb520b44 100644 --- a/indra/newview/skins/default/xui/en/widgets/floater.xml +++ b/indra/newview/skins/default/xui/en/widgets/floater.xml @@ -16,13 +16,11 @@ minimize_image="Icon_Minimize_Foreground" tear_off_image="tearoffbox.tga" dock_image="Icon_Dock_Foreground" - undock_image="Icon_Undock_Foreground" help_image="Icon_Help_Foreground" close_pressed_image="Icon_Close_Press" restore_pressed_image="Icon_Restore_Press" minimize_pressed_image="Icon_Minimize_Press" tear_off_pressed_image="tearoff_pressed.tga" dock_pressed_image="Icon_Dock_Press" - undock_pressed_image="Icon_Undock_Press" help_pressed_image="Icon_Help_Press" /> diff --git a/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml b/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml index c2a70d4b39..5d429d5b5b 100644 --- a/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml +++ b/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml @@ -13,7 +13,8 @@ <combo_editor name="child1" select_on_focus="true" - text_pad_left="30" + text_pad_left="30" + text_tentative_color="TextFgTentativeColor" background_image="TextField_Search_Off" background_image_disabled="TextField_Search_Disabled" background_image_focused="TextField_Search_Active"/> diff --git a/indra/newview/skins/default/xui/en/widgets/search_editor.xml b/indra/newview/skins/default/xui/en/widgets/search_editor.xml index f644a710b2..1616e4c3f7 100644 --- a/indra/newview/skins/default/xui/en/widgets/search_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/search_editor.xml @@ -4,6 +4,7 @@ search_button_visible="true" text_pad_left="6" select_on_focus="true" + text_tentative_color="TextFgTentativeColor" background_image="TextField_Search_Off" background_image_disabled="TextField_Search_Disabled" background_image_focused="TextField_Search_Active" > diff --git a/indra/newview/skins/default/xui/en/widgets/teleport_history_menu_item.xml b/indra/newview/skins/default/xui/en/widgets/teleport_history_menu_item.xml new file mode 100644 index 0000000000..eaa68f5690 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/teleport_history_menu_item.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<!-- Menu items for the back button drop-down menu of locations. + Based on menu_item_call.xml --> +<teleport_history_menu_item + back_item_font="SansSerif" + current_item_font="SansSerifBold" + forward_item_font="SansSerif" + back_item_image="teleport_history_backward.tga" + forward_item_image="teleport_history_forward.tga" + image_hpad="1" + image_vpad="0" + /> |