summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-09-01 17:47:26 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-09-01 17:47:26 -0400
commit76f867c8913094573bfa278fc39907d6b0779ec5 (patch)
tree55c0e011b26c4e0d43139433e59e3249ec80140b /indra/newview
parentda7f2af75cc3f14f64fa4bdae83e555be0074a1e (diff)
parentbe025f9610698ee1d070850be2065bc5f5f721b3 (diff)
merge
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/skins/default/xui/en/floater_model_preview.xml6
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"