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/control_table_contents_media.xml10
-rw-r--r--indra/newview/skins/default/xui/en/floater_model_preview.xml64
2 files changed, 74 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/control_table_contents_media.xml b/indra/newview/skins/default/xui/en/control_table_contents_media.xml
index ce5d3556b6..a97c45dd6f 100644
--- a/indra/newview/skins/default/xui/en/control_table_contents_media.xml
+++ b/indra/newview/skins/default/xui/en/control_table_contents_media.xml
@@ -73,4 +73,14 @@
name="lst_action"
value="Start Gesture" />
</rows>
+ <rows
+ name="sript_trigger_lbutton"
+ value="sript_trigger_lbutton">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Interact (Script LMB)" />
+ </rows>
</contents>
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..db9d296fa5 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -176,6 +176,22 @@
name="Generate"
label="Generate"
value="Generate" />
+ <item
+ name="MeshOpt"
+ label="Simplify (auto)"
+ value="MeshOpt" />
+ <item
+ name="MeshOptCombine"
+ label="Simplify per object"
+ value="MeshOptCombine" />
+ <item
+ name="MeshOpt"
+ label="Simplify per face"
+ value="MeshOpt" />
+ <item
+ name="MeshOptSloppy"
+ label="Simplify sloppy"
+ value="MeshOptSloppy" />
</combo_box>
<line_editor
follows="left|top"
@@ -306,6 +322,22 @@
label="Generate"
value="Generate" />
<item
+ name="MeshOpt"
+ label="Simplify (auto)"
+ value="MeshOpt" />
+ <item
+ name="MeshOptCombine"
+ label="Simplify per object"
+ value="MeshOptCombine" />
+ <item
+ name="MeshOpt"
+ label="Simplify per face"
+ value="MeshOpt" />
+ <item
+ name="MeshOptSloppy"
+ label="Simplify sloppy"
+ value="MeshOptSloppy" />
+ <item
name="Use LoD above"
label="Use LoD above"
value="Use LoD above" />
@@ -439,6 +471,22 @@
label="Generate"
value="Generate" />
<item
+ name="MeshOpt"
+ label="Simplify (auto)"
+ value="MeshOpt" />
+ <item
+ name="MeshOptCombine"
+ label="Simplify per object"
+ value="MeshOptCombine" />
+ <item
+ name="MeshOpt"
+ label="Simplify per face"
+ value="MeshOpt" />
+ <item
+ name="MeshOptSloppy"
+ label="Simplify sloppy"
+ value="MeshOptSloppy" />
+ <item
name="Use LoD above"
label="Use LoD above"
value="Use LoD above" />
@@ -572,6 +620,22 @@
label="Generate"
value="Generate" />
<item
+ name="MeshOpt"
+ label="Simplify (auto)"
+ value="MeshOpt" />
+ <item
+ name="MeshOptCombine"
+ label="Simplify per object"
+ value="MeshOptCombine" />
+ <item
+ name="MeshOpt"
+ label="Simplify per face"
+ value="MeshOpt" />
+ <item
+ name="MeshOptSloppy"
+ label="Simplify sloppy"
+ value="MeshOptSloppy" />
+ <item
name="Use LoD above"
label="Use LoD above"
value="Use LoD above" />