diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-08-31 18:25:27 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-08-31 18:25:27 -0600 |
| commit | be025f9610698ee1d070850be2065bc5f5f721b3 (patch) | |
| tree | 0bf8d20e2a8888d8fc25e09e7533a1f539858545 /indra | |
| parent | da39e2c5e3d660542c6e8eba3abad561a7d30ffc (diff) | |
| parent | 18b47df3e27bcd93a41699c166deb3df39767963 (diff) | |
Automated merge with http://hg.secondlife.com/mesh-development
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/skins/default/xui/en/floater_model_preview.xml | 6 |
1 files changed, 4 insertions, 2 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 259d2e70b6..522ffa7232 100755 --- a/indra/newview/skins/default/xui/en/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml @@ -4,8 +4,8 @@ name="Model Preview" title="Upload Model" width="620" help_topic="upload_model" > - <string name="status_idle">Idle</string> - <string name="status_parse_error">Dae parsing issue - see log for details.</string> + <string name="status_idle"></string> + <string name="status_parse_error">Error: Dae parsing issue - see log for details.</string> <string name="status_reading_file">Loading...</string> <string name="status_generating_meshes">Generating Meshes...</string> <string name="status_vertex_number_overflow">Error: Vertex number is more than 65534, aborted!</string> @@ -112,6 +112,8 @@ visible="false"> 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 text_color="Yellow" left="10" bottom_delta="0" width="290" height="15" follows="bottom|left|right" name="status">[STATUS]</text> + <text height="26" top_pad="5" |