diff options
Diffstat (limited to 'indra/newview/skins/default')
8 files changed, 47 insertions, 20 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_create_landmark.xml b/indra/newview/skins/default/xui/en/floater_create_landmark.xml index abe8344097..6d3da72962 100644 --- a/indra/newview/skins/default/xui/en/floater_create_landmark.xml +++ b/indra/newview/skins/default/xui/en/floater_create_landmark.xml @@ -87,7 +87,7 @@ name="notes_editor" spellcheck="true" text_readonly_color="white" - prevalidator="ascii_with_newline" + prevalidator="ascii" commit_on_focus_lost="true" top_pad="5" width="290" diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml index af8e882f10..bf8c5875d0 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml @@ -127,31 +127,35 @@ top_delta="16" left="30" width="160" - name="MaxTextureResolutionLabel" + name="TextureQualityLabel" text_readonly_color="LabelDisabledColor"> - Maximum LOD resolution: + Texture quality: </text> <combo_box - control_name="RenderMaxTextureResolution" + control_name="RenderTextureQuality" height="19" layout="topleft" left_pad="10" top_delta="0" - name="MaxTextureResolution" - tool_tip="Maximum resolution for 'level of detail' textures" + name="TextureQuality" + tool_tip="Controls maximum texture resolution and how aggressively textures stream by channel. Higher quality keeps more detail in memory." width="90"> <combo_box.item - label="512" - name="512" - value="512"/> + label="Low" + name="Low" + value="0"/> + <combo_box.item + label="Medium" + name="Medium" + value="1"/> <combo_box.item - label="1024" - name="1024" - value="1024"/> + label="High" + name="High" + value="2"/> <combo_box.item - label="2048" - name="2048" - value="2048"/> + label="Ultra" + name="Ultra" + value="3"/> </combo_box> <check_box diff --git a/indra/newview/skins/default/xui/en/floater_profile.xml b/indra/newview/skins/default/xui/en/floater_profile.xml index 32ab811a6e..3a33572785 100644 --- a/indra/newview/skins/default/xui/en/floater_profile.xml +++ b/indra/newview/skins/default/xui/en/floater_profile.xml @@ -31,7 +31,7 @@ follows="all" layout="topleft" halign="center" - tab_min_width="81" + tab_min_width="80" tab_height="30" tab_position="top" > diff --git a/indra/newview/skins/default/xui/en/floater_script.xml b/indra/newview/skins/default/xui/en/floater_script.xml index ae6e68de17..20feec615c 100644 --- a/indra/newview/skins/default/xui/en/floater_script.xml +++ b/indra/newview/skins/default/xui/en/floater_script.xml @@ -8,8 +8,8 @@ can_dock="true" can_minimize="true" visible="false" - width="350" + width="402" can_resize="false" - min_width="350" + min_width="402" min_height="200"> </floater> diff --git a/indra/newview/skins/default/xui/en/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/en/menu_conversation_log_view.xml index 864bec5d9a..1e10a984da 100644 --- a/indra/newview/skins/default/xui/en/menu_conversation_log_view.xml +++ b/indra/newview/skins/default/xui/en/menu_conversation_log_view.xml @@ -34,6 +34,16 @@ function="CallLog.Check" parameter="sort_friends_on_top" /> </menu_item_check> + <menu_item_check + label="Show muted" + name="show_muted"> + <on_click + function="CallLog.Action" + parameter="show_blocked" /> + <on_check + function="CallLog.Check" + parameter="show_blocked" /> + </menu_item_check> <menu_item_separator /> <menu_item_call label="View Nearby chat history..." diff --git a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml index 6bb891db63..d907a050b6 100644 --- a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml @@ -10,6 +10,18 @@ min_height="350" min_width="240" width="323"> + <string + name="no_blocked" + value="No blocked residents or objects." /> + <string + name="no_filtered_blocked" + value="No blocked residents or objects match your search." /> + <string + name="loading_blocked" + value="Loading blocked residents and objects..." /> + <string + name="failed_blocked" + value="Blocked list is currently unavailable." /> <panel follows="left|top|right" height="27" diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml index 4d924a6c24..fcfd2357b5 100644 --- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml @@ -196,8 +196,8 @@ text_color="LtGray" tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!" top="13" - valign="bottom" - width="290"> + valign="bottom" + width="310"> Places you save to your favorites bar will appear here. </label> <!-- More button actually is a text box. --> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 60304b6962..b8e71928dc 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2335,6 +2335,7 @@ For AI Character: Get the closest navigable point to the point provided. <string name="InventorySingleFolderEmpty">Folder is empty.</string> <string name="InventorySingleFolderNoMatches">No matches.</string> <string name="InventoryNoTexture">You do not have a copy of this texture in your inventory</string> + <string name="InventoryNoMaterial">You do not have a copy of this material in your inventory</string> <string name="InventoryInboxNoItems">Your Marketplace purchases will appear here. You may then drag them into your inventory to use them.</string> <string name="MarketplaceURL">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/</string> <string name="MarketplaceURL_CreateStore">http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.3</string> |