summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/floater_about.xml1
-rw-r--r--indra/newview/skins/default/xui/en/floater_model_preview.xml64
2 files changed, 24 insertions, 41 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..bde7aec672 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -101,7 +101,6 @@ 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)
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 05990e28d8..d08bc92e5d 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -187,24 +187,20 @@
label="Load from file"
value="Load from file" />
<item
- name="Generate"
- label="Generate"
- value="Generate" />
- <item
- name="MeshOpt"
- label="Simplify (auto)"
- value="MeshOpt" />
+ name="MeshOpt Auto"
+ label="Generate Auto"
+ value="MeshOpt Auto" />
<item
name="MeshOptCombine"
- label="Simplify per object"
+ label="Generate Precise"
value="MeshOptCombine" />
<item
name="MeshOpt"
- label="Simplify per face"
+ label="Generate per face"
value="MeshOpt" />
<item
name="MeshOptSloppy"
- label="Simplify sloppy"
+ label="Generate Sloppy"
value="MeshOptSloppy" />
</combo_box>
<line_editor
@@ -332,24 +328,20 @@
label="Load from file"
value="Load from file" />
<item
- name="Generate"
- label="Generate"
- value="Generate" />
- <item
- name="MeshOpt"
- label="Simplify (auto)"
- value="MeshOpt" />
+ name="MeshOpt Auto"
+ label="Generate Auto"
+ value="MeshOpt Auto" />
<item
name="MeshOptCombine"
- label="Simplify per object"
+ label="Generate Precise"
value="MeshOptCombine" />
<item
name="MeshOpt"
- label="Simplify per face"
+ label="Generate per face"
value="MeshOpt" />
<item
name="MeshOptSloppy"
- label="Simplify sloppy"
+ label="Generate Sloppy"
value="MeshOptSloppy" />
<item
name="Use LoD above"
@@ -481,24 +473,20 @@
label="Load from file"
value="Load from file" />
<item
- name="Generate"
- label="Generate"
- value="Generate" />
- <item
- name="MeshOpt"
- label="Simplify (auto)"
- value="MeshOpt" />
+ name="MeshOpt Auto"
+ label="Generate Auto"
+ value="MeshOpt Auto" />
<item
name="MeshOptCombine"
- label="Simplify per object"
+ label="Generate Precise"
value="MeshOptCombine" />
<item
name="MeshOpt"
- label="Simplify per face"
+ label="Generate per face"
value="MeshOpt" />
<item
name="MeshOptSloppy"
- label="Simplify sloppy"
+ label="Generate Sloppy"
value="MeshOptSloppy" />
<item
name="Use LoD above"
@@ -630,24 +618,20 @@
label="Load from file"
value="Load from file" />
<item
- name="Generate"
- label="Generate"
- value="Generate" />
- <item
- name="MeshOpt"
- label="Simplify (auto)"
- value="MeshOpt" />
+ name="MeshOpt Auto"
+ label="Generate Auto"
+ value="MeshOpt Auto" />
<item
name="MeshOptCombine"
- label="Simplify per object"
+ label="Generate Precise"
value="MeshOptCombine" />
<item
name="MeshOpt"
- label="Simplify per face"
+ label="Generate per face"
value="MeshOpt" />
<item
name="MeshOptSloppy"
- label="Simplify sloppy"
+ label="Generate Sloppy"
value="MeshOptSloppy" />
<item
name="Use LoD above"