diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2012-09-07 12:53:07 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2012-09-07 12:53:07 -0400 |
| commit | 04e8d074b2f21438b3f9c463a387c964cd5b6961 (patch) | |
| tree | c95b5bee3fd31fc66b0055c9635f5d8369cbd5e6 /indra/newview/skins/default/xui/it/floater_model_preview.xml | |
| parent | 7bee4b58ff1e36ca39abc090991833c43c8903cc (diff) | |
| parent | e3b4b3875a6d8c7857ba948a662ace4731913ecf (diff) | |
DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.
This was yet another refresh from v-d because of significant changes
to lltexturefetch that would not have been resolvable by casual
application of any merge tool. There are still a few questions
outstanding but this is the initial, optimistic merge.
Diffstat (limited to 'indra/newview/skins/default/xui/it/floater_model_preview.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/it/floater_model_preview.xml | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/it/floater_model_preview.xml b/indra/newview/skins/default/xui/it/floater_model_preview.xml index ca36fd2def..e8df4d2d4b 100644 --- a/indra/newview/skins/default/xui/it/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/it/floater_model_preview.xml @@ -92,19 +92,54 @@ <text initial_value="Triangoli" name="triangles" value="Triangoli"/> <text initial_value="Vertici" name="vertices" value="Vertici"/> <text initial_value="Alto" name="high_label" value="Alto"/> + <combo_box name="lod_source_high"> + <item name="Load from file" value="Carica da file"/> + <item name="Generate" value="Genera"/> + </combo_box> <button label="Sfoglia..." name="lod_browse_high"/> + <combo_box name="lod_mode_high"> + <item name="Triangle Limit" value="Limite triangoli"/> + <item name="Error Threshold" value="Limite errori"/> + </combo_box> <text initial_value="0" name="high_triangles" value="0"/> <text initial_value="0" name="high_vertices" value="0"/> <text initial_value="Medio" name="medium_label" value="Medio"/> + <combo_box name="lod_source_medium"> + <item name="Load from file" value="Carica da file"/> + <item name="Generate" value="Genera"/> + <item name="Use LoD above" value="Usa livello di dettaglio indicato in precedenza"/> + </combo_box> <button label="Sfoglia..." name="lod_browse_medium"/> + <combo_box name="lod_mode_medium"> + <item name="Triangle Limit" value="Limite triangoli"/> + <item name="Error Threshold" value="Limite errori"/> + </combo_box> <text initial_value="0" name="medium_triangles" value="0"/> <text initial_value="0" name="medium_vertices" value="0"/> <text initial_value="Basso" name="low_label" value="Basso"/> + <combo_box name="lod_source_low"> + <item name="Load from file" value="Carica da file"/> + <item name="Generate" value="Genera"/> + <item name="Use LoD above" value="Usa livello di dettaglio indicato in precedenza"/> + </combo_box> <button label="Sfoglia..." name="lod_browse_low"/> + <combo_box name="lod_mode_low"> + <item name="Triangle Limit" value="Limite triangoli"/> + <item name="Error Threshold" value="Limite errori"/> + </combo_box> <text initial_value="0" name="low_triangles" value="0"/> <text initial_value="0" name="low_vertices" value="0"/> <text initial_value="Bassissimo" name="lowest_label" value="Bassissimo"/> + <combo_box name="lod_source_lowest"> + <item name="Load from file" value="Carica da file"/> + <item name="Generate" value="Genera"/> + <item name="Use LoD above" value="Usa livello di dettaglio indicato in precedenza"/> + </combo_box> <button label="Sfoglia..." name="lod_browse_lowest"/> + <combo_box name="lod_mode_lowest"> + <item name="Triangle Limit" value="Limite triangoli"/> + <item name="Error Threshold" value="Limite errori"/> + </combo_box> <text initial_value="0" name="lowest_triangles" value="0"/> <text initial_value="0" name="lowest_vertices" value="0"/> <check_box label="Genera normali" name="gen_normals"/> |