diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en')
13 files changed, 207 insertions, 34 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml index 431c33a339..7aa31bed71 100644 --- a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml @@ -170,6 +170,20 @@ name="icon_setting" tool_tip="Environment settings" left_pad="2" /> + <check_box + control_name="BulkChangeIncludeMaterials" + height="16" + name="check_materials" + top_pad="5" + left="245" + width="16" /> + <icon + height="16" + image_name="Inv_Material" + mouse_opaque="true" + name="icon_materials" + tool_tip="Materials" + left_pad="2" /> <button height="23" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml b/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml new file mode 100644 index 0000000000..c8726d36b4 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + height="130" + width="300" + layout="topleft" + name="floater_new_feature_notification" + title="NEW FEATURE" + show_title="false" + header_height="0" + bg_opaque_image="Window_NoTitle_Foreground" + bg_alpha_image="Window_NoTitle_Background" + can_resize="false" + can_drag_on_left="false" + can_minimize="false" + can_close="false"> + <floater.string name="title_txt_inventory"> +New inventory features + </floater.string> + <floater.string name="description_txt_inventory"> +You can now add preview images to inventory items and view a folder in its own window. +Learn more in this [https://community.secondlife.com/blogs/entry/13637-new-features-inventory-item-preview-and-single-folder-view/ blogpost] + </floater.string> + <floater.string name="title_txt_gltf"> +New GLTF PBR materials support + </floater.string> + <floater.string name="description_txt_gltf"> +You can now use expanded material support with the ability to import and edit GLTF Physically Based Rendering (PBR) Materials. +In order to support the addition of the GLTF format, some areas in the viewer may appear darker than usual. + +Learn more about [https://wiki.secondlife.com/wiki/PBR_Materials Physically Based Rendering (PBR)] + </floater.string> + <text + type="string" + length="1" + follows="top|left|right" + font="SansSerifLargeBold" + text_color="White" + layout="topleft" + left="10" + height="14" + top="10" + right="-10" + name="title_txt"> +New feature + </text> + <text + type="string" + length="1" + follows="top|left|right|bottom" + text_color="White" + layout="topleft" + left="10" + height="40" + top_pad="14" + right="-10" + word_wrap="true" + name="description_txt"> +Feature description + </text> + <button + follows="bottom|left|right" + layout="topleft" + height="24" + label="Got it!" + left="104" + bottom="-10" + name="close_btn" + width="90"/> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 4094a487a9..510351b471 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -1114,11 +1114,15 @@ label="Open" name="Open" value="Open" /> - <combo_box.item + <combo_box.item label="Zoom" name="Zoom" value="Zoom" /> <combo_box.item + label="Ignore object" + name="Ignoreobject" + value="Ignore" /> + <combo_box.item label="None" name="None" value="None" /> diff --git a/indra/newview/skins/default/xui/en/floater_top_objects.xml b/indra/newview/skins/default/xui/en/floater_top_objects.xml index b82fe43e74..a8b4b84ab7 100644 --- a/indra/newview/skins/default/xui/en/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/en/floater_top_objects.xml @@ -273,4 +273,17 @@ <button.commit_callback function="TopObjects.ReturnAll" /> </button> + <button + follows="bottom|left" + height="23" + label="Teleport to selected" + layout="topleft" + left_pad="10" + name="teleport_btn" + enabled="false" + top_delta="0" + width="160"> + <button.commit_callback + function="TopObjects.TeleportToSelected" /> +</button> </floater> diff --git a/indra/newview/skins/default/xui/en/menu_attachment_self.xml b/indra/newview/skins/default/xui/en/menu_attachment_self.xml index 943bfb8122..8e041f8de3 100644 --- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml +++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml @@ -17,7 +17,7 @@ name="EditGLTFMaterial"> <menu_item_call.on_click function="Object.EditGLTFMaterial" /> - <menu_item_call.on_enable + <menu_item_call.on_visible function="Object.EnableEditGLTFMaterial"/> </menu_item_call> <menu_item_call 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 c1500d4e7c..425de6cab8 100644 --- a/indra/newview/skins/default/xui/en/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml @@ -75,7 +75,7 @@ name="remove_friend"> <menu_item_call.on_click function="Avatar.RemoveFriend" /> - <menu_item_call.on_enable + <menu_item_call.on_visible function="Avatar.EnableItem" parameter="can_delete" /> </menu_item_call> diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 7a29d68a4c..e254ae8859 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -794,14 +794,36 @@ name="LandShow" tear_off="true"> <menu_item_check - label="Ban Lines" - name="Ban Lines"> + label="Hide Ban Lines" + name="Hide Ban Lines"> <menu_item_check.on_check - control="ShowBanLines" /> + function="World.CheckBanLines" + parameter="0" /> <menu_item_check.on_click - function="ToggleControl" - parameter="ShowBanLines" /> + function="World.ShowBanLines" + parameter="0" /> + </menu_item_check> + <menu_item_check + label="Show Ban Lines On Collision" + name="Show Ban Lines On Collision"> + <menu_item_check.on_check + function="World.CheckBanLines" + parameter="1" /> + <menu_item_check.on_click + function="World.ShowBanLines" + parameter="1" /> + </menu_item_check> + <menu_item_check + label="Show Ban Lines On Proximity" + name="Show Ban Lines On Proximity"> + <menu_item_check.on_check + function="World.CheckBanLines" + parameter="2" /> + <menu_item_check.on_click + function="World.ShowBanLines" + parameter="2" /> </menu_item_check> + <menu_item_separator /> <menu_item_check label="Beacons" name="beacons" @@ -1446,6 +1468,15 @@ function="World.EnvPreset" function="Tools.SelectInvisibleObjects" parameter="invisible" /> </menu_item_check> + <menu_item_check + label="Select Reflection Probes" + name="Select Reflection Probes"> + <menu_item_check.on_check + control="SelectReflectionProbes" /> + <menu_item_check.on_click + function="Tools.SelectReflectionProbes" + parameter="reflection_probes" /> + </menu_item_check> <menu_item_check label="Select By Surrounding" name="Select By Surrounding"> @@ -3472,15 +3503,30 @@ function="World.EnvPreset" <menu_item_call.on_click function="Advanced.DumpRegionObjectCache" /> </menu_item_call> - -<menu_item_call - label="Interest List: Full Update" - name="Interest List: Full Update" + <menu_item_check + label="Record Stats to File" + name="Stats Recorder File"> + <menu_item_check.on_check + function="Advanced.CheckStatsRecorder" /> + <menu_item_check.on_click + function="Advanced.ToggleStatsRecorder" /> + </menu_item_check> + <menu_item_check + label="Interest Lists 360 Mode" + name="Interest List: 360 Mode" shortcut="alt|shift|I"> - <menu_item_call.on_click - function="Advanced.InterestListFullUpdate" /> - </menu_item_call> - </menu> + <menu_item_check.on_check + function="Advanced.CheckInterestList360Mode" /> + <menu_item_check.on_click + function="Advanced.ToggleInterestList360Mode" /> + </menu_item_check> + <menu_item_call + label="Reset Interest Lists" + name="Reset Interest Lists"> + <menu_item_call.on_click + function="Advanced.ResetInterestLists" /> + </menu_item_call> + </menu> <menu create_jump_keys="true" label="UI" @@ -3495,13 +3541,6 @@ function="World.EnvPreset" parameter="http://duckduckgo.com"/> </menu_item_call> <menu_item_call - label="FB Connect Test" - name="FB Connect Test"> - <menu_item_call.on_click - function="Advanced.WebContentTest" - parameter="https://cryptic-ridge-1632.herokuapp.com/"/> - </menu_item_call> - <menu_item_call label="Dump SelectMgr" name="Dump SelectMgr"> <menu_item_call.on_click diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index d3a31f16ec..bbc3798034 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -9211,6 +9211,18 @@ We cannot display a preview of this texture because it is no-copy and/or no-tran <notification icon="alertmodal.tga" + name="LivePreviewUnavailablePBR" + type="alert"> + +We cannot display a preview of this material because it is no-copy, no-transfer, and/or no-modify. + <usetemplate + ignoretext="Warn me that Live Preview mode is not available for no-copy, no-transfer, and/or no-modify materials" + name="okignore" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" name="FacePasteFailed" type="alertmodal"> Paste failed. [REASON] @@ -12122,9 +12134,8 @@ Would you like to save them first? <notification icon="notifytip.tga" name="AutoAdjustHDRSky" - persist="true" type="alertmodal"> - You are editing a non-HDR sky that has been automatically converted to HDR. To remove HDR and tone mapping, set Reflection Probe Ambiance to zero. + You are editing a non-HDR sky that has been automatically converted to HDR. To remove HDR and tone mapping, set Reflection Probe Ambiance to zero. <usetemplate ignoretext="HDR Sky adjustment warning" name="okignore" diff --git a/indra/newview/skins/default/xui/en/panel_script_experience.xml b/indra/newview/skins/default/xui/en/panel_script_experience.xml index e798638751..9ae5b201a6 100644 --- a/indra/newview/skins/default/xui/en/panel_script_experience.xml +++ b/indra/newview/skins/default/xui/en/panel_script_experience.xml @@ -48,23 +48,28 @@ layout="topleft" visible="false"> <layout_panel width="120" - height="140"> - <text > + height="140" + name="xp_layout_panel"> + <text name="lbl_script"> Script: </text> - <text bottom_delta="25"> + <text bottom_delta="25" + name="lbl_associated"> Associated with: </text> - <text bottom_delta="25"> + <text bottom_delta="25" + name="lbl_contribute"> You can contribute: </text> - <text bottom_delta="25"> + <text bottom_delta="25" + name="lbl_associate"> Associate with: </text> </layout_panel> <layout_panel width="250" - height="140"> + height="140" + name="xp_choose_panel"> <text > EasySit Animator 1.2.4 </text> diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml index 36a485e498..2d79bc74ab 100644 --- a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml +++ b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml @@ -298,7 +298,7 @@ Maximum Altitude: </text> <slider - decimal_digits="1" + decimal_digits="2" follows="left|top" height="16" increment="0.01" diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml index 51e6099ceb..5b15752eb7 100644 --- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml +++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml @@ -284,12 +284,26 @@ name="pbr_from_inventory" label="Choose from inventory" width="140"/> + <text + visible="false" + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + top_pad="4" + left_delta="0" + name="material_permissions_loading_label" + text_readonly_color="LabelDisabledColor" + width="160"> + Loading contents... + </text> <button follows="left|top" height="23" layout="topleft" left_delta="0" - top_pad="4" + top_delta="0" name="edit_selected_pbr" label="Edit Selected" width="140"/> diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml index 0b32215964..5f0241512a 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml @@ -300,6 +300,10 @@ name="Zoom" value="Zoom" /> <combo_box.item + label="Ignore object" + name="Ignoreobject" + value="Ignore" /> + <combo_box.item label="None" name="None" value="None" /> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 9c634b661a..36b7c57aba 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -233,7 +233,7 @@ If you feel this is an error, please contact support@secondlife.com</string> <string name="TooltipForSaleL$">For Sale: L$[AMOUNT]</string> <!-- L$ version --> <string name="TooltipFlagGroupBuild">Group Build</string> <string name="TooltipFlagNoBuild">No Build</string> - <string name="TooltipFlagNoEdit">Group Build</string> + <string name="TooltipFlagNoEdit">No Edit</string> <string name="TooltipFlagNotSafe">Not Safe</string><!-- damage area --> <string name="TooltipFlagNoFly">No Fly</string> <string name="TooltipFlagGroupScripts">Group Scripts</string> |