diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en')
5 files changed, 92 insertions, 60 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index 71f4d81195..eb07425dfe 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -101,11 +101,11 @@ Dummy Name replaced at run time expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd. FreeType Copyright (C) 1996-2002, 2006 David Turner, Robert Wilhelm, and Werner Lemberg. GL Copyright (C) 1999-2004 Brian Paul. - GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University and David Luebke, Brenden Schubert, University of Virginia. google-perftools Copyright (c) 2005, Google Inc. Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited. jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW) jpeglib Copyright (C) 1991-1998, Thomas G. Lane. + meshoptimizer Copyright (c) 2016-2021 Arseny Kapoulkine ogg/vorbis Copyright (C) 2002, Xiphophorus OpenSSL Copyright (C) 1998-2008 The OpenSSL Project. PCRE Copyright (c) 1997-2012 University of Cambridge diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml index f4cf2cb512..e499ddbc2f 100644 --- a/indra/newview/skins/default/xui/en/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml @@ -34,7 +34,7 @@ <string name="mesh_status_missing_lod">Missing required level of detail.</string> <string name="mesh_status_invalid_material_list">LOD materials are not a subset of reference model.</string> <string name="phys_status_vertex_limit_exceeded">Some physical hulls exceed vertex limitations.</string> - <string name="phys_status_degenerate_triangles">The physics mesh too dense remove the small thin triangles (see preview)</string> + <string name="phys_status_degenerate_triangles">The physics mesh is too dense or contains degenerate triangles. Use Analyze/Simplify to resolve.</string> <string name="layer_all">All</string> <!-- Text to display in physics layer combo box for "all layers" --> <string name="decomposing">Analyzing...</string> <string name="simplifying">Simplifying...</string> @@ -45,7 +45,21 @@ <string name="UnrecognizedJoint">Rigged to unrecognized joint name [NAME]</string> <string name="UnknownJoints">Skinning disabled due to [COUNT] unknown joints</string> <string name="ModelLoaded">Model [MODEL_NAME] loaded</string> + <string name="IncompleteTC">Texture coordinates data is not complete.</string> + <string name="PositionNaN">Found NaN while loading position data from DAE-Model, invalid model.</string> + <string name="NormalsNaN">Found NaN while loading normals from DAE-Model, invalid model.</string> + <string name="NegativeScaleTrans">Negative scale detected, unsupported transform. domInstance_geometry: [LABEL]</string> + <string name="NegativeScaleNormTrans">Negative scale detected, unsupported post-normalization transform. domInstance_geometry: [LABEL]</string> + <string name="CantResolveGeometryUrl">Unable to resolve geometry URL.</string> + <string name="ParsingErrorBadElement">Bad element</string> + <string name="ParsingErrorCantParseScene">Scene could not be parsed</string> + <string name="ParsingErrorCorrupt">Error with dae - traditionally indicates a corrupt file.</string> + <string name="ParsingErrorNoController">Could not verify controller</string> + <string name="ParsingErrorNoDoc">Can't find internal doc</string> + <string name="ParsingErrorNoRoot">Document has no root</string> + <string name="ParsingErrorNoScene">Document has no visual_scene</string> + <string name="ParsingErrorPositionInvalidModel">Unable to process mesh without position data. Invalid model.</string> <panel follows="top|left" @@ -173,9 +187,17 @@ label="Load from file" value="Load from file" /> <item - name="Generate" - label="Generate" - value="Generate" /> + name="MeshOpt Auto" + label="Generate Auto" + value="MeshOpt Auto" /> + <item + name="MeshOptCombine" + label="Generate Precise" + value="MeshOptCombine" /> + <item + name="MeshOptSloppy" + label="Generate Sloppy" + value="MeshOptSloppy" /> </combo_box> <line_editor follows="left|top" @@ -302,9 +324,17 @@ label="Load from file" value="Load from file" /> <item - name="Generate" - label="Generate" - value="Generate" /> + name="MeshOpt Auto" + label="Generate Auto" + value="MeshOpt Auto" /> + <item + name="MeshOptCombine" + label="Generate Precise" + value="MeshOptCombine" /> + <item + name="MeshOptSloppy" + label="Generate Sloppy" + value="MeshOptSloppy" /> <item name="Use LoD above" label="Use LoD above" @@ -435,9 +465,17 @@ label="Load from file" value="Load from file" /> <item - name="Generate" - label="Generate" - value="Generate" /> + name="MeshOpt Auto" + label="Generate Auto" + value="MeshOpt Auto" /> + <item + name="MeshOptCombine" + label="Generate Precise" + value="MeshOptCombine" /> + <item + name="MeshOptSloppy" + label="Generate Sloppy" + value="MeshOptSloppy" /> <item name="Use LoD above" label="Use LoD above" @@ -568,9 +606,17 @@ label="Load from file" value="Load from file" /> <item - name="Generate" - label="Generate" - value="Generate" /> + name="MeshOpt Auto" + label="Generate Auto" + value="MeshOpt Auto" /> + <item + name="MeshOptCombine" + label="Generate Precise" + value="MeshOptCombine" /> + <item + name="MeshOptSloppy" + label="Generate Sloppy" + value="MeshOptSloppy" /> <item name="Use LoD above" label="Use LoD above" 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 7786ba8a1c..d1e167df64 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 @@ -102,6 +102,18 @@ Low </text> + <check_box + control_name="RenderVSyncEnable" + height="16" + initial_value="true" + label="Enable VSync" + layout="topleft" + left="30" + top_delta="16" + name="vsync" + tool_tip="Synchronizes the frame rate to the refresh rate of the monitor, which results in smooth performance." + width="315" /> + <text type="string" length="1" @@ -334,18 +346,6 @@ width="256" /> <check_box - control_name="RenderVBOEnable" - height="16" - initial_value="true" - label="Enable OpenGL Vertex Buffer Objects" - layout="topleft" - left="30" - top_delta="16" - name="vbo" - tool_tip="Enabling this on modern hardware gives a performance gain. However, older hardware often has poor implementations of VBOs and you may get crashes when this is enabled." - width="315" /> - - <check_box control_name="RenderCompressTextures" height="16" initial_value="true" @@ -661,20 +661,6 @@ </text> <check_box - control_name="RenderAvatarVP" - height="16" - initial_value="true" - label="Avatar Hardware skinning" - layout="topleft" - left="440" - name="AvatarVertexProgram" - top_delta="16" - width="280"> - <check_box.commit_callback - function="Pref.RenderOptionUpdate" /> - </check_box> - - <check_box control_name="RenderAvatarCloth" height="16" initial_value="true" @@ -885,7 +871,7 @@ layout="topleft" left="13" name="horiz_border" - top_pad="5" + top_pad="21" top_delta="5" width="774"/> <button diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml index f9d44b2c69..b9ca0108b6 100644 --- a/indra/newview/skins/default/xui/en/floater_stats.xml +++ b/indra/newview/skins/default/xui/en/floater_stats.xml @@ -35,6 +35,25 @@ decimal_digits="1" show_bar="true" show_history="true"/> + <stat_bar name="frame_mean" + label="frame (mean)" + unit_label="ms" + stat="frametime" + decimal_digits="1" + show_bar="false" + show_history="false"/> + <stat_bar name="frame_median" + label="frame (median)" + unit_label="ms" + stat="frametime" + show_median="true" + decimal_digits="1" + show_bar="false" + show_history="false"/> + <stat_bar name="framet_jitter" + label="jitter" + decimal_digits="1" + stat="frametimejitter"/> <stat_bar name="bandwidth" label="UDP Data Received" stat="activemessagedatareceived" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index dd8a2cf5fd..aa93601669 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -8787,13 +8787,6 @@ See SecondLife.log for details type="alert"> Error while requesting mesh upload permissons. </notification> - - <notification - name="MeshUploadProfilerError" - icon="alert.tga" - type="alert"> -Mesh uploader is incompatible with RenderGLCoreProfile, please turn RenderGLCoreProfile off in debug settings and restart the viewer. - </notification> <notification name="RegionCapabilityRequestError" @@ -9641,18 +9634,6 @@ Do you wish to continue? yestext="OK"/> </notification> - <global name="UnsupportedShaderRequirements"> -You do not appear to meet the hardware requirements for [APP_NAME]. [APP_NAME] requires OpenGL 2.0 or later shader support. If this is the case, you may want to make sure that you have the latest drivers for your graphics card, and service packs and patches for your operating system. - -If you continue to have problems, please visit the [SUPPORT_SITE]. - </global> - - <global name="UnsupportedGLRequirements"> -You do not appear to have the proper hardware requirements for [APP_NAME]. [APP_NAME] requires an OpenGL graphics card that has multitexture support. If this is the case, you may want to make sure that you have the latest drivers for your graphics card, and service packs and patches for your operating system. - -If you continue to have problems, please visit the [SUPPORT_SITE]. - </global> - <global name="UnsupportedIntelDriver"> The installed Intel graphics driver for [GPUNAME], version [VERSION], is significantly out of date and is known to cause excessive rates of program crashes. You are strongly advised to update to a current Intel driver |