diff options
| author | Don Kjer <don@lindenlab.com> | 2011-07-12 18:10:44 -0700 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-07-12 18:10:44 -0700 |
| commit | 40a489a9cc1b23db35c7b12f34e35cd2b191a307 (patch) | |
| tree | 316e420be0ea12d6094772a337da50c19d4b6142 /indra/newview/skins/default | |
| parent | 4e16dc26ab3fd0506ba800f124649259aec46136 (diff) | |
| parent | c45c603eeefb3b5692213e7840dda6a55f6e4b68 (diff) | |
Merge
Diffstat (limited to 'indra/newview/skins/default')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/skins/default/xui/en/floater_model_preview.xml | 20 |
1 files changed, 13 insertions, 7 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 060ddec1f4..1d4a1d4827 100644..100755 --- a/indra/newview/skins/default/xui/en/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml @@ -92,7 +92,7 @@ parse_urls="true" wrap="true" visible="false"> - You will not be able to complete the final upload of this model to the Second Life servers. [secondlife:///app/floater/learn_more Find out how] to get enabled for mesh model uploads.</text> + You will not be able to complete the final upload of this model to the Second Life servers. [[VURL] Find out how] to get enabled for mesh model uploads.</text> <text height="65" @@ -102,9 +102,9 @@ width="80" word_wrap="true" > -Streaming: +Download: Physics: -Simulation: +Server: Prim equivs: </text> @@ -123,7 +123,8 @@ Prim equivs: [EQ] </text> - + +<!-- <text height="65" top_delta="0" @@ -153,6 +154,7 @@ L$ [INSTANCES] L$ [TEXTURES] L$ [MODEL] </text> + --> <tab_container follows="right|top|bottom" @@ -168,7 +170,8 @@ L$ [MODEL] <panel border="true" label="Level of Detail" - name="lod_panel"> + name="lod_panel" + help_topic="upload_model_lod"> <text left="10" width="240" bottom="20" height="15" follows="left|top" name="lod_table_header"> Select Level of Detail: @@ -291,7 +294,8 @@ L$ [MODEL] <panel border="true" label="Physics" - name="physics_panel"> + name="physics_panel" + help_topic="upload_model_physics"> <!-- PHYSICS GEOMETRY--> <panel @@ -432,7 +436,9 @@ L$ [MODEL] <panel border="true" label="Modifiers" - name="modifiers_panel"> + name="modifiers_panel" + help_topic="upload_model_modifiers"> + <text left="10" width="90" bottom="30" follows="top|left" height="15"> Scale: </text> |