summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-04-01 16:49:27 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-04-01 16:49:27 -0400
commit793ff1c94a7e434edcc3fcfb3f570172bed01262 (patch)
treeba92cc9f2197d98baea5069e736b9e4afda5c382 /indra/newview/skins
parent1ccb583181410ebd0742b0e47047ff74cfadd45c (diff)
parente04b7f007f71be65395d01184264f18f1662246a (diff)
merge
Diffstat (limited to 'indra/newview/skins')
-rwxr-xr-xindra/newview/skins/default/xui/en/floater_model_preview.xml1
-rw-r--r--indra/newview/skins/default/xui/en/floater_model_wizard.xml1
2 files changed, 2 insertions, 0 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 23dc28f54c..d08c3e7078 100755
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -6,6 +6,7 @@
<string name="status_idle">Idle</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>
<string name="high">High</string>
<string name="medium">Medium</string>
<string name="low">Low</string>
diff --git a/indra/newview/skins/default/xui/en/floater_model_wizard.xml b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
index fa340118d5..4b312c6ce7 100644
--- a/indra/newview/skins/default/xui/en/floater_model_wizard.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
@@ -1026,6 +1026,7 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
<string name="status_idle">Idle</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>
<string name="high">High</string>
<string name="medium">Medium</string>
<string name="low">Low</string>