diff options
Diffstat (limited to 'indra/newview/skins/default/xui')
14 files changed, 66 insertions, 175 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml index 6ecdd76573..f89ad2f997 100644 --- a/indra/newview/skins/default/xui/en/floater_aaa.xml +++ b/indra/newview/skins/default/xui/en/floater_aaa.xml @@ -17,6 +17,7 @@ save_visibility="true" single_instance="true" width="320"> + <string name="nudge_parabuild">Nudge 1</string> <chat_history allow_html="true" bg_readonly_color="ChatHistoryBgColor" diff --git a/indra/newview/skins/default/xui/en/floater_sell_land.xml b/indra/newview/skins/default/xui/en/floater_sell_land.xml index e6a78563f3..409f46b960 100644 --- a/indra/newview/skins/default/xui/en/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/en/floater_sell_land.xml @@ -182,7 +182,7 @@ width="130"> <combo_box.item enabled="false" - label="-- select one --" + label="- Select one -" name="--selectone--" value="select" /> <combo_box.item diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml index 643336cf6c..c3a2540b2e 100644 --- a/indra/newview/skins/default/xui/en/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml @@ -27,7 +27,6 @@ function="Avatar.IM" /> </menu_item_call> <menu_item_call - enabled="false" label="Call" layout="topleft" name="Call"> diff --git a/indra/newview/skins/default/xui/en/menu_text_editor.xml b/indra/newview/skins/default/xui/en/menu_text_editor.xml index 7c9e6f0796..ecd96088e7 100644 --- a/indra/newview/skins/default/xui/en/menu_text_editor.xml +++ b/indra/newview/skins/default/xui/en/menu_text_editor.xml @@ -32,10 +32,10 @@ function="Edit.EnablePaste" /> </menu_item_call> <menu_item_call - label="Delete" - layout="topleft" - name="Delete" - shortcut="Del"> + label="Delete" + layout="topleft" + name="Delete" + shortcut="Del"> <menu_item_call.on_click function="Edit.Delete" /> <menu_item_call.on_enable diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index ae8a1599a9..37136af680 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -3268,6 +3268,17 @@ </menu> <menu_item_separator layout="topleft" /> + <menu_item_check + label="HTTP Textures" + layout="topleft" + name="HTTP Textures"> + <menu_item_check.on_check + function="CheckControl" + parameter="ImagePipelineUseHTTP" /> + <menu_item_check.on_click + function="ToggleControl" + parameter="ImagePipelineUseHTTP" /> + </menu_item_check> <menu_item_call label="Compress Images" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_classified.xml b/indra/newview/skins/default/xui/en/panel_classified.xml index 9622313786..c8293d3663 100644 --- a/indra/newview/skins/default/xui/en/panel_classified.xml +++ b/indra/newview/skins/default/xui/en/panel_classified.xml @@ -107,7 +107,7 @@ top="48" width="130"> <combo_box.item - label="- Select Mature -" + label="- Select one -" name="select_mature" value="Select" /> <combo_box.item 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 043edd10e1..e5dc4df0f8 100644 --- a/indra/newview/skins/default/xui/en/panel_group_general.xml +++ b/indra/newview/skins/default/xui/en/panel_group_general.xml @@ -145,7 +145,7 @@ Hover your mouse over the options for more help. layout="topleft" left="10" name="group_mature_check" - tool_tip="Sets whether your group information is considered moderate" + tool_tip="Sets whether your group contains information rated as Moderate" top_pad="0" width="190"> <combo_box.item 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 fe3e010cf9..3c87331199 100644 --- a/indra/newview/skins/default/xui/en/panel_my_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml @@ -416,6 +416,7 @@ left="10" label="Edit Profile" name="edit_profile_btn" + tool_tip="Edit your personal information" width="130" /> <button follows="bottom|right" @@ -423,6 +424,7 @@ label="Edit Appearance" left_pad="10" name="edit_appearance_btn" + tool_tip="Create/edit your appearance: physical data, clothes and etc." right="-10" width="130" /> </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 d805209bf5..51997a2813 100644 --- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml @@ -17,7 +17,7 @@ <accordion_tab layout="topleft" name="tab_outfits" - title="Outfits bar"> + title="Outfits"> <inventory_panel allow_multi_select="true" border="true" @@ -33,7 +33,7 @@ <accordion_tab layout="topleft" name="tab_cof" - title="Current Outfit bar"> + title="Current Outfit"> <inventory_panel allow_multi_select="true" border="true" diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml index 4c2bd67337..52bc72fe86 100644 --- a/indra/newview/skins/default/xui/en/panel_picks.xml +++ b/indra/newview/skins/default/xui/en/panel_picks.xml @@ -106,7 +106,7 @@ layout="topleft" left_pad="15" name="new_btn" - tool_tip="Create new pick at current location" + tool_tip="Create new pick or classified at current location" top="5" width="18" /> <button @@ -138,6 +138,7 @@ left="5" name="info_btn" tab_stop="false" + tool_tip="Show pic information" top="0" width="55" /> <button @@ -149,6 +150,7 @@ left_pad="5" name="teleport_btn" tab_stop="false" + tool_tip="Teleport to the corresponding area" top="0" width="77" /> <button @@ -160,6 +162,7 @@ left_pad="5" name="show_on_map_btn" tab_stop="false" + tool_tip="Show corresponding area on the world map" top="0" width="50" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml index 23832ba120..29e9b476eb 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml @@ -78,7 +78,7 @@ top_pad="10" width="350" /> <check_box - control_name="AutoPlayMedia" + control_name="ParcelMediaAutoPlayEnable" height="16" label="Allow Media Autoplay" layout="topleft" @@ -86,15 +86,6 @@ name="autoplay_enabled" top_pad="10" width="350" /> - <check_box - control_name="ParcelMediaAutoPlayEnable" - height="16" - label="Automatically Play Parcel Media" - layout="topleft" - left="30" - name="parcel_autoplay_enabled" - top_pad="10" - width="350" /> <text type="string" length="1" diff --git a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml index 8b86067b03..e21de31498 100644 --- a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml @@ -3,7 +3,7 @@ follows="left|right|top|bottom" name="MediaControls" background_visible="false" - height="192" + height="200" layout="topleft" mouse_opaque="false" width="800"> @@ -16,20 +16,20 @@ <string name="zoom_far_padding">1.5</string> <panel name="media_region" - bottom="125" + height="100" follows="left|right|top|bottom" layout="topleft" mouse_opaque="false" - top="20" /> + top="0" /> <layout_stack name="media_controls" follows="left|right" animate="false" - height="26" + height="75" layout="topleft" left="0" orientation="horizontal" - top="128"> + top="100"> <!-- outer layout_panels center the inner one --> <layout_panel name="left_bookend" @@ -239,19 +239,6 @@ layout="topleft" width="190" min_width="90"> - <!-- - RE-ENABLE THIS WHEN WE HAVE A HISTORY DROP-DOWN AGAIN - <combo_box - name="media_address_url" - allow_text_entry="true" - height="22" - layout="topleft" - max_chars="1024" - tool_tip = "Media URL"> - <combo_box.commit_callback - function="MediaCtrl.CommitURL" /> - </combo_box> - --> <line_editor name="media_address_url" follows="left|right" @@ -314,8 +301,9 @@ <slider_bar name="media_play_slider" follows="left|right|top" - height="16" - increment="0.05" + height="20" + bottom="88" + increment="0.01" initial_value="0.5" layout="topleft" tool_tip="Movie play progress" @@ -379,7 +367,8 @@ auto_resize="false" user_resize="false" layout="topleft" - height="22" + top="-50" + height="72" min_width="22" width="22"> <!-- Note: this is not quite right either...the mute button is not the --> @@ -397,138 +386,30 @@ layout="topleft" scale_image="false" tool_tip="Mute This Media" - top_delta="18" + top="118" min_width="22" width="22" > <button.commit_callback function="MediaCtrl.ToggleMute" /> + <button.mouseenter_callback + function="MediaCtrl.ShowVolumeSlider" /> </button> - </layout_panel> - <!-- We do not have a design yet for "volume", so this is a temporary --> - <!-- solution. See DEV-42827. --> - <layout_panel - name="volume_up" - auto_resize="false" - user_resize="false" - layout="topleft" - min_width="14" - height="14" - width="14"> - <button - image_overlay="media_btn_scrollup.png" - image_disabled="PushButton_Disabled" - image_disabled_selected="PushButton_Disabled" - image_selected="PushButton_Selected" - image_unselected="PushButton_Off" - hover_glow_amount="0.15" - top="-5" - height="14" - layout="topleft" - tool_tip="Volume up" - scale_image="true" - min_width="14" - width="14" > - <button.commit_callback - function="MediaCtrl.CommitVolumeUp" /> - </button> - </layout_panel> - <layout_panel - name="volume_down" - auto_resize="false" - user_resize="false" - layout="topleft" - min_width="14" - height="14" - width="14"> - <button - image_overlay="media_btn_scrolldown.png" - image_disabled="PushButton_Disabled" - image_disabled_selected="PushButton_Disabled" - image_selected="PushButton_Selected" - image_unselected="PushButton_Off" - hover_glow_amount="0.15" - layout="topleft" - tool_tip="Volume down" - scale_image="true" - top="-5" - height="14" - min_width="14" - width="14"> - <button.commit_callback - function="MediaCtrl.CommitVolumeDown" /> - </button> - </layout_panel> - <!-- Scroll pad --> - <!-- This was removed from the design, but is still here because it is --> - <!-- complex, and recreating it would be hard. In case the design --> - <!-- changes, here it lies: --> - <!-- - <layout_panel - name="media_panel_scroll" - auto_resize="false" - user_resize="false" - height="32" - follows="left|right|top|bottom" - layout="topleft" - min_width="32" - width="32"> - <icon - height="32" - image_name="media_panel_scrollbg.png" - layout="topleft" - top="0" - min_width="32" - width="32" /> - <button - name="scrollup" - height="8" - image_selected="media_btn_scrollup.png" - image_unselected="media_btn_scrollup.png" - layout="topleft" - tool_tip="Scroll up" - scale_image="false" - left="12" - top_delta="4" - min_width="8" - width="8" /> - <button - name="scrollleft" - height="8" - image_selected="media_btn_scrollleft.png" - image_unselected="media_btn_scrollleft.png" - layout="topleft" - left="3" - tool_tip="Scroll left" - scale_image="false" - top="12" - min_width="8" - width="8" /> - <button - name="scrollright" - height="8" - image_selected="media_btn_scrollright.png" - image_unselected="media_btn_scrollright.png" - layout="topleft" - left_pad="9" - tool_tip="Scroll right" - scale_image="false" - top_delta="0" - min_width="8" - width="8" /> - <button - name="scrolldown" - height="8" - image_selected="media_btn_scrolldown.png" - image_unselected="media_btn_scrolldown.png" + <slider + orientation="vertical" + left="0" + top="-2" + height="50" layout="topleft" - left="12" - tool_tip="Scroll down" - scale_image="false" - top="20" - min_width="8" - width="8" /> + increment="0.01" + initial_value="0.5" + name="volume_slider" + tool_tip="Media Volume" + show_text="false" + volume="true"> + <slider.commit_callback + function="MediaCtrl.Volume"/> + </slider> </layout_panel> - --> <panel height="28" layout="topleft" @@ -628,7 +509,7 @@ animate="false" left="0" orientation="horizontal" - top="150"> + top="170"> <!-- outer layout_panels center the inner one --> <layout_panel width="0" diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index 947bb67152..6be203ef9c 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -287,7 +287,7 @@ mouse_opaque="false" name="add_friend" top="5" - width="76" /> + width="77" /> <button follows="bottom|left" height="19" @@ -296,7 +296,7 @@ name="im" top="5" left_pad="5" - width="31" /> + width="33" /> <button follows="bottom|left" height="19" @@ -315,7 +315,7 @@ name="show_on_map_btn" top="5" left_pad="5" - width="42" /> + width="44" /> <button follows="bottom|left" height="19" @@ -324,7 +324,7 @@ name="teleport" left_pad="5" top="5" - width="64" /> + width="67" /> <button follows="bottom|right" height="19" diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml index 0e2700cb80..17fb58764b 100644 --- a/indra/newview/skins/default/xui/en/widgets/location_input.xml +++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml @@ -22,9 +22,12 @@ > <!-- *NOTE: Tooltips are in strings.xml so they can be localized. See LocationCtrlAddLandmarkTooltip etc. --> - <info_button name="Place Information" - width="16" - height="16" + <info_button + name="Place Information" + width="16" + height="16" + left="4" + top="20" follows="left|top" hover_glow_amount="0.15" image_unselected="Info_Off" |