summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorSeth ProductEngine <slitovchuk@productengine.com>2011-09-05 19:51:19 +0300
committerSeth ProductEngine <slitovchuk@productengine.com>2011-09-05 19:51:19 +0300
commit03f835c87ea783250c89e0949f4e3dc800f0db69 (patch)
treefbfe4f4417eaeb77f1c3c73b55891db47c7589b1 /indra/newview/skins/default
parent97c6672634b4c6620ebc320ec05758fc2ea99288 (diff)
parent76f867c8913094573bfa278fc39907d6b0779ec5 (diff)
merge
Diffstat (limited to 'indra/newview/skins/default')
-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 52e70f3b6d..4f50802bac 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>
@@ -28,6 +28,8 @@
<string name="tbd">TBD</string>
+ <text text_color="Yellow" left="10" bottom_delta="0" width="290" height="15" follows="bottom|left|right" name="status">[STATUS]</text>
+
<!--
<text
height="65"