diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-02-20 18:06:21 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-02-20 18:06:21 -0500 |
| commit | 7ba82a6409e4fc096407f0247b084950d1e3c14a (patch) | |
| tree | c78a08e30fcbf8463a3c53433e3c91edb8c63292 /indra/newview/skins/default/xui/en/floater_model_preview.xml | |
| parent | 0d6872e1f5cf96b0489bde722015627aa3ca76a9 (diff) | |
| parent | eb5d634ef97a638f59785c507f7211674edef3ea (diff) | |
merge changes for BUG-7387
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_model_preview.xml')
| -rwxr-xr-x | indra/newview/skins/default/xui/en/floater_model_preview.xml | 19 |
1 files changed, 19 insertions, 0 deletions
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 a4acd1df78..56bf9833f5 100755 --- a/indra/newview/skins/default/xui/en/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml @@ -184,9 +184,11 @@ width="135"> <item name="Load from file" + label="Load from file" value="Load from file" /> <item name="Generate" + label="Generate" value="Generate" /> </combo_box> <line_editor @@ -219,9 +221,11 @@ width="130"> <item name="Triangle Limit" + label="Triangle Limit" value="Triangle Limit" /> <item name="Error Threshold" + label="Error Threshold" value="Error Threshold" /> </combo_box> <spinner @@ -309,12 +313,15 @@ width="135"> <item name="Load from file" + label="Load from file" value="Load from file" /> <item name="Generate" + label="Generate" value="Generate" /> <item name="Use LoD above" + label="Use LoD above" value="Use LoD above" /> </combo_box> <line_editor @@ -348,9 +355,11 @@ width="130"> <item name="Triangle Limit" + label="Triangle Limit" value="Triangle Limit" /> <item name="Error Threshold" + label="Error Threshold" value="Error Threshold" /> </combo_box> <spinner @@ -437,12 +446,15 @@ width="135"> <item name="Load from file" + label="Load from file" value="Load from file" /> <item name="Generate" + label="Generate" value="Generate" /> <item name="Use LoD above" + label="Use LoD above" value="Use LoD above" /> </combo_box> <line_editor @@ -476,9 +488,11 @@ width="130"> <item name="Triangle Limit" + label="Triangle Limit" value="Triangle Limit" /> <item name="Error Threshold" + label="Error Threshold" value="Error Threshold" /> </combo_box> <spinner @@ -565,12 +579,15 @@ width="135"> <item name="Load from file" + label="Load from file" value="Load from file" /> <item name="Generate" + label="Generate" value="Generate" /> <item name="Use LoD above" + label="Use LoD above" value="Use LoD above" /> </combo_box> <line_editor @@ -604,9 +621,11 @@ width="130"> <item name="Triangle Limit" + label="Triangle Limit" value="Triangle Limit" /> <item name="Error Threshold" + label="Error Threshold" value="Error Threshold" /> </combo_box> <spinner |