summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-03-31 19:06:48 -0400
committerLoren Shih <seraph@lindenlab.com>2011-03-31 19:06:48 -0400
commitc27e18fd1959e52b2cedcd72799a1e46c9528456 (patch)
tree936f3ab05261d3d34975a24047453120d3713177 /indra/newview
parent3c2cc1784506109932e54c85d4f67acbcdd2229a (diff)
parent17fc2e1f5b43a94985114722c1106bbc3332d33d (diff)
Automated merge from mesh-development
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/skins/default/xui/en/floater_model_wizard.xml26
1 files changed, 13 insertions, 13 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_model_wizard.xml b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
index 93740007ee..fa340118d5 100644
--- a/indra/newview/skins/default/xui/en/floater_model_wizard.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
@@ -422,12 +422,12 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
<combo_item name="medium">
Medium
</combo_item>
- <combo_item name="lowest">
- Lowest
- </combo_item>
<combo_item name="low">
Low
</combo_item>
+ <combo_item name="lowest">
+ Lowest
+ </combo_item>
</combo_box>
<panel
left="10"
@@ -449,12 +449,12 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
<slider
follows="left|top"
height="20"
- increment="1"
+ increment="0.5"
layout="topleft"
left="204"
- max_val="2"
- initial_value="1"
- min_val="0"
+ max_val="4"
+ initial_value="3"
+ min_val="2"
name="accuracy_slider"
show_text="false"
top="120"
@@ -674,12 +674,12 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
<combo_item name="medium">
Medium
</combo_item>
- <combo_item name="lowest">
- Lowest
- </combo_item>
<combo_item name="low">
Low
</combo_item>
+ <combo_item name="lowest">
+ Lowest
+ </combo_item>
</combo_box>
<panel
left="10"
@@ -807,12 +807,12 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
<combo_item name="medium">
Medium
</combo_item>
- <combo_item name="lowest">
- Lowest
- </combo_item>
<combo_item name="low">
Low
</combo_item>
+ <combo_item name="lowest">
+ Lowest
+ </combo_item>
</combo_box>
<panel
left="10"