diff options
Diffstat (limited to 'indra/newview/skins/default/xui')
9 files changed, 178 insertions, 119 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_performance.xml b/indra/newview/skins/default/xui/en/floater_performance.xml index 210b2f8792..c47b8100c2 100644 --- a/indra/newview/skins/default/xui/en/floater_performance.xml +++ b/indra/newview/skins/default/xui/en/floater_performance.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - height="692" + height="592" layout="topleft" name="performance" save_rect="true" @@ -47,7 +47,7 @@ text_color="White" height="20" layout="topleft" - left_pad="0" + left_pad="3" top="13" name="fps_lbl" width="450"> @@ -93,7 +93,7 @@ border="true" bevel_style="none" follows="left|top" - height="70" + height="50" width="560" name="settings_subpanel" layout="topleft" @@ -107,7 +107,7 @@ layout="topleft" left="10" name="settings_lbl" - top="12" + top="7" width="180"> Graphics settings </text> @@ -119,7 +119,7 @@ layout="topleft" left="10" name="settings_desc" - top_pad="10" + top_pad="0" width="395"> Choose settings for distance, water, lighting and more. </text> @@ -130,7 +130,7 @@ mouse_opaque="true" name="icon_arrow3" follows="right|top" - top="29" + top="19" right="-20"/> </panel> <panel @@ -140,11 +140,11 @@ border="true" bevel_style="none" follows="left|top" - height="70" + height="50" width="560" name="nearby_subpanel" layout="topleft" - top_pad="20"> + top_pad="10"> <text follows="left|top" font="SansSerifLarge" @@ -153,7 +153,7 @@ layout="topleft" left="10" name="avatars_nearby_lbl" - top="12" + top="7" width="205"> Avatars nearby </text> @@ -165,7 +165,7 @@ layout="topleft" left="10" name="avatars_nearby_desc" - top_pad="10" + top_pad="0" width="395"> Manage which nearby avatars are fully displayed. </text> @@ -176,7 +176,7 @@ mouse_opaque="true" name="icon_arrow2" follows="right|top" - top="29" + top="19" right="-20"/> </panel> <panel @@ -186,11 +186,11 @@ border="true" bevel_style="none" follows="left|top" - height="70" + height="50" width="560" name="complexity_subpanel" layout="topleft" - top_pad="20"> + top_pad="10"> <text follows="left|top" font="SansSerifLarge" @@ -199,7 +199,7 @@ layout="topleft" left="10" name="complexity_lbl" - top="12" + top="7" width="180"> Your avatar complexity </text> @@ -211,7 +211,7 @@ layout="topleft" left="10" name="complexity_info" - top_pad="10" + top_pad="0" width="455"> Reduce the complexity of your avatar if you aren't satisfied with current FPS. </text> @@ -222,7 +222,7 @@ mouse_opaque="true" name="icon_arrow4" follows="right|top" - top="29" + top="19" right="-20"/> </panel> <panel @@ -232,11 +232,11 @@ border="true" bevel_style="none" follows="left|top" - height="70" + height="50" width="560" name="huds_subpanel" layout="topleft" - top_pad="20"> + top_pad="10"> <text follows="left|top" font="SansSerifLarge" @@ -245,7 +245,7 @@ layout="topleft" left="10" name="huds_lbl" - top="12" + top="7" width="135"> Your active HUDs </text> @@ -257,7 +257,7 @@ layout="topleft" left="10" name="huds_desc" - top_pad="10" + top_pad="0" width="395"> Removing HUDs you are not using can improve speed. </text> @@ -268,7 +268,7 @@ mouse_opaque="true" name="icon_arrow4" follows="right|top" - top="29" + top="19" right="-20"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/menu_attachment_other.xml b/indra/newview/skins/default/xui/en/menu_attachment_other.xml index 7ad692038e..22006c287f 100644 --- a/indra/newview/skins/default/xui/en/menu_attachment_other.xml +++ b/indra/newview/skins/default/xui/en/menu_attachment_other.xml @@ -131,22 +131,12 @@ <menu_item_separator /> <context_menu - label="Render Avatar" + label="Display this avatar" layout="topleft" - name="Render Avatar"> - <menu_item_check - name="RenderNormally" - label="Default"> - <menu_item_check.on_check - function="Avatar.CheckImpostorMode" - parameter="0" /> - <menu_item_check.on_click - function="Avatar.SetImpostorMode" - parameter="0" /> - </menu_item_check> + name="Render Avatar"> <menu_item_check name="AlwaysRenderFully" - label="Always"> + label="Always full detail"> <menu_item_check.on_check function="Avatar.CheckImpostorMode" parameter="2" /> @@ -156,7 +146,7 @@ </menu_item_check> <menu_item_check name="DoNotRender" - label="Never"> + label="Never full detail"> <menu_item_check.on_check function="Avatar.CheckImpostorMode" parameter="1" /> @@ -164,6 +154,16 @@ function="Avatar.SetImpostorMode" parameter="1" /> </menu_item_check> + <menu_item_call + name="RenderNormally" + label="Remove from exceptions"> + <menu_item_call.on_visible + function="Avatar.CheckImpostorMode" + parameter="4" /> + <menu_item_call.on_click + function="Avatar.SetImpostorMode" + parameter="0" /> + </menu_item_call> <menu_item_separator /> <menu_item_call label="Exceptions..." diff --git a/indra/newview/skins/default/xui/en/menu_avatar_other.xml b/indra/newview/skins/default/xui/en/menu_avatar_other.xml index acbb9b860d..665eb9a82f 100644 --- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml +++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml @@ -122,39 +122,39 @@ <menu_item_separator /> <context_menu - label="Render Avatar" + label="Display this avatar" layout="topleft" - name="Render Avatar"> - <menu_item_check - name="RenderNormally" - label="Default"> - <menu_item_check.on_check - function="Avatar.CheckImpostorMode" - parameter="0" /> - <menu_item_check.on_click - function="Avatar.SetImpostorMode" - parameter="0" /> - </menu_item_check> - <menu_item_check - name="AlwaysRenderFully" - label="Always"> - <menu_item_check.on_check - function="Avatar.CheckImpostorMode" - parameter="2" /> - <menu_item_check.on_click - function="Avatar.SetImpostorMode" - parameter="2" /> - </menu_item_check> - <menu_item_check - name="DoNotRender" - label="Never"> - <menu_item_check.on_check - function="Avatar.CheckImpostorMode" - parameter="1" /> - <menu_item_check.on_click - function="Avatar.SetImpostorMode" - parameter="1" /> - </menu_item_check> + name="Render Avatar"> + <menu_item_check + name="AlwaysRenderFully" + label="Always full detail"> + <menu_item_check.on_check + function="Avatar.CheckImpostorMode" + parameter="2" /> + <menu_item_check.on_click + function="Avatar.SetImpostorMode" + parameter="2" /> + </menu_item_check> + <menu_item_check + name="DoNotRender" + label="Never full detail"> + <menu_item_check.on_check + function="Avatar.CheckImpostorMode" + parameter="1" /> + <menu_item_check.on_click + function="Avatar.SetImpostorMode" + parameter="1" /> + </menu_item_check> + <menu_item_call + name="RenderNormally" + label="Remove from exceptions"> + <menu_item_call.on_visible + function="Avatar.CheckImpostorMode" + parameter="4" /> + <menu_item_call.on_click + function="Avatar.SetImpostorMode" + parameter="0" /> + </menu_item_call> <menu_item_separator /> <menu_item_call label="Exceptions..." diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 177f995b12..b1adf97444 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -127,13 +127,6 @@ function="Floater.Toggle" parameter="preferences" /> </menu_item_call> - <menu_item_call - label="Performance..." - name="Performance"> - <menu_item_call.on_click - function="Floater.Toggle" - parameter="performance" /> - </menu_item_call> <menu_item_call label="Toolbar buttons..." name="Toolbars"> @@ -860,7 +853,13 @@ parameter="UseDebugMenus" /> </menu_item_check> </menu> - + <menu_item_call + label="Improve graphics speed..." + name="Performance"> + <menu_item_call.on_click + function="Floater.Toggle" + parameter="performance" /> + </menu_item_call> <menu_item_separator/> <!-- <menu_item_check label="Show Navigation Bar" diff --git a/indra/newview/skins/default/xui/en/panel_performance_complexity.xml b/indra/newview/skins/default/xui/en/panel_performance_complexity.xml index b2f65f9488..40159314f7 100644 --- a/indra/newview/skins/default/xui/en/panel_performance_complexity.xml +++ b/indra/newview/skins/default/xui/en/panel_performance_complexity.xml @@ -2,7 +2,7 @@ <panel bevel_style="none" follows="left|top" - height="490" + height="530" width="580" name="panel_performance_complexity" layout="topleft" @@ -54,7 +54,7 @@ left="20" name="attachments_desc1" width="580"> - If your avatar is very complex, some other people may not see you in full detail and + Attachments make your avatar more complex. If your avatar is very complex, some other </text> <text follows="left|top" @@ -66,12 +66,24 @@ left="20" name="attachments_desc2" width="580"> - your own graphics speed may be reduced. + people may not see you in full detail, and your graphics speed may be reduced. Removing + </text> + <text + follows="left|top" + font="SansSerifSmall" + text_color="White" + height="18" + layout="topleft" + top_pad="3" + left="20" + name="attachments_desc3" + width="580"> + heavy attachments that you don’t need can help. </text> <name_list column_padding="0" draw_stripes="true" - height="220" + height="379" follows="left|top" layout="topleft" name="obj_list" diff --git a/indra/newview/skins/default/xui/en/panel_performance_huds.xml b/indra/newview/skins/default/xui/en/panel_performance_huds.xml index 7dcadc557b..eea6b79e30 100644 --- a/indra/newview/skins/default/xui/en/panel_performance_huds.xml +++ b/indra/newview/skins/default/xui/en/panel_performance_huds.xml @@ -2,7 +2,7 @@ <panel bevel_style="none" follows="left|top" - height="490" + height="530" width="580" name="panel_performance_huds" layout="topleft" @@ -71,7 +71,7 @@ <name_list column_padding="0" draw_stripes="true" - height="220" + height="400" follows="left|top" layout="topleft" name="hud_list" diff --git a/indra/newview/skins/default/xui/en/panel_performance_nearby.xml b/indra/newview/skins/default/xui/en/panel_performance_nearby.xml index 4cc7ffda40..e1aef13717 100644 --- a/indra/newview/skins/default/xui/en/panel_performance_nearby.xml +++ b/indra/newview/skins/default/xui/en/panel_performance_nearby.xml @@ -2,7 +2,7 @@ <panel bevel_style="none" follows="left|top" - height="490" + height="530" width="580" name="panel_performance_nearby" layout="topleft" @@ -54,7 +54,7 @@ top_pad="5" name="av_nearby_desc" width="580"> - Avatars more complex than your chosen limit will be shown in silhouette. + Hide the most complex avatars to boost speed. </text> <slider control_name="IndirectMaxComplexity" @@ -63,7 +63,7 @@ height="16" initial_value="101" increment="1" - label="Maximum avatar complexity" + label="Maximum complexity (K)" text_color="White" label_width="165" layout="topleft" @@ -90,11 +90,12 @@ <name_list column_padding="0" draw_stripes="true" - height="220" + height="280" left="20" follows="left|top" layout="topleft" sort_column="complex_value" + short_names="true" name="nearby_list" name_column="name" top_pad="10" @@ -144,6 +145,70 @@ left="18" width="256"> </check_box> - + <view_border + bevel_style="in" + height="0" + layout="topleft" + name="border" + top_pad="15" + left="20" + width="540"/> + <check_box + height="16" + initial_value="true" + label="Hide avatars completely (good for landscape photos)" + layout="topleft" + name="hide_avatars" + top_delta="15" + left="18" + width="280"> + </check_box> + <text + type="string" + length="1" + follows="left|top" + height="15" + layout="topleft" + left="20" + name="name_tags_textbox" + top_pad="10" + width="400"> + Name tags: + </text> + <radio_group + control_name="AvatarNameTagMode" + height="20" + layout="topleft" + left="120" + top_delta="0" + name="name_tag_mode"> + <radio_item + label="Off" + name="radio" + top_delta="20" + layout="topleft" + height="16" + left="0" + value="0" + width="75" /> + <radio_item + label="On" + left_pad="0" + layout="topleft" + top_delta="0" + height="16" + name="radio2" + value="1" + width="75" /> + <radio_item + label="Show briefly" + left_pad="0" + name="radio3" + height="16" + layout="topleft" + top_delta="0" + value="2" + width="160" /> + </radio_group> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_performance_preferences.xml b/indra/newview/skins/default/xui/en/panel_performance_preferences.xml index fb62e7beb3..221dfa0222 100644 --- a/indra/newview/skins/default/xui/en/panel_performance_preferences.xml +++ b/indra/newview/skins/default/xui/en/panel_performance_preferences.xml @@ -2,7 +2,7 @@ <panel bevel_style="none" follows="left|top" - height="630" + height="530" width="580" name="panel_performance_preferences" layout="topleft" @@ -44,11 +44,21 @@ width="300"> Graphics settings </text> + <button + follows="top|left" + height="23" + label="Open Advanced Settings" + layout="topleft" + left="360" + name="advanced_btn" + top_delta="0" + width="200"/> <view_border bevel_style="in" height="0" layout="topleft" name="border1" + left="20" top_pad="8" width="540"/> <text @@ -156,7 +166,7 @@ height="0" layout="topleft" name="border2" - top_pad="15" + top_pad="5" left="20" width="540"/> <text @@ -238,7 +248,7 @@ height="0" layout="topleft" name="border3" - top_pad="15" + top_pad="5" left="20" width="540"/> <text @@ -325,7 +335,7 @@ height="0" layout="topleft" name="border3" - top_pad="15" + top_pad="7" left="20" width="540"/> <text @@ -418,7 +428,7 @@ height="0" layout="topleft" name="border4" - top_pad="15" + top_pad="7" left="20" width="540"/> <text @@ -469,33 +479,6 @@ width="180"> (Enter value between 0.0 and 4.0) </text> - <check_box - height="16" - initial_value="true" - label="Hide avatars completely (good for landscape photos)" - layout="topleft" - name="hide_avatars" - top_delta="29" - left="157" - width="280"> - </check_box> - <view_border - bevel_style="in" - height="0" - layout="topleft" - name="border5" - top_pad="10" - left="20" - width="540"/> - <button - follows="top|left" - height="23" - label="Open Advanced Settings" - layout="topleft" - left="160" - name="advanced_btn" - top_pad="12" - width="200"/> <text follows="left|top" font="SansSerifSmall" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index d115e09d5b..db6fbfe362 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -4271,7 +4271,7 @@ Try enclosing path to the editor with double quotes. <string name="preset_combo_label">-Empty list-</string> <string name="Default">Default</string> <string name="none_paren_cap">(None)</string> - <string name="no_limit">No Limit</string> + <string name="no_limit">No limit</string> <string name="Mav_Details_MAV_FOUND_DEGENERATE_TRIANGLES"> The physics shape contains triangles which are too small. Try simplifying the physics model. |