summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/floater_about.xml2
-rw-r--r--indra/newview/skins/default/xui/en/floater_model_preview.xml86
2 files changed, 75 insertions, 13 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 7f863756eb..d08bc92e5d 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -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,21 @@
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="MeshOpt"
+ label="Generate per face"
+ value="MeshOpt" />
+ <item
+ name="MeshOptSloppy"
+ label="Generate Sloppy"
+ value="MeshOptSloppy" />
</combo_box>
<line_editor
follows="left|top"
@@ -302,9 +328,21 @@
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="MeshOpt"
+ label="Generate per face"
+ value="MeshOpt" />
+ <item
+ name="MeshOptSloppy"
+ label="Generate Sloppy"
+ value="MeshOptSloppy" />
<item
name="Use LoD above"
label="Use LoD above"
@@ -435,9 +473,21 @@
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="MeshOpt"
+ label="Generate per face"
+ value="MeshOpt" />
+ <item
+ name="MeshOptSloppy"
+ label="Generate Sloppy"
+ value="MeshOptSloppy" />
<item
name="Use LoD above"
label="Use LoD above"
@@ -568,9 +618,21 @@
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="MeshOpt"
+ label="Generate per face"
+ value="MeshOpt" />
+ <item
+ name="MeshOptSloppy"
+ label="Generate Sloppy"
+ value="MeshOptSloppy" />
<item
name="Use LoD above"
label="Use LoD above"