summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2019-11-27 20:34:26 +0200
committerandreykproductengine <andreykproductengine@lindenlab.com>2019-11-27 20:34:26 +0200
commit1840868178cbf3577ffa9757f093207f3bb10fd7 (patch)
tree773e73ab5d3c3668b2a7f8c34c56013bd83ededf /indra/newview/skins/default/xui
parentd0c7b4fade611bb3bd05a4e6230145b1babc9f7f (diff)
SL-304 [Mesh Uploader] Localization support for logs, better warnings for joints
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/floater_model_preview.xml31
1 files changed, 29 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 cbc5aeb37d..7e92e0360e 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -38,6 +38,12 @@
<string name="decomposing">Analyzing...</string>
<string name="simplifying">Simplifying...</string>
<string name="tbd">TBD</string>
+
+ <!-- Warnings from model loader-->
+ <string name="TooManyJoint">Skinning disabled due to too many joints: [JOINTS], maximum: [MAX]</string>
+ <string name="UnrecognizedJoint">Rigged to unrecognized joint name [NAME]</string>
+ <string name="UnknownJoints">Skinning disabled due to [COUNT] unknown joints</string>
+
<panel
follows="top|left"
@@ -1184,20 +1190,41 @@
label_text.text_color="White"
name="upload_skin"
top_pad="15"/>
+ <text
+ follows="top|left"
+ height="17"
+ left="40"
+ name="skin_too_many_joints"
+ text_color="Orange"
+ top_pad="-2"
+ width="150">
+ Too many skinned joints
+ </text>
+ <text
+ follows="top|left"
+ height="17"
+ left="40"
+ name="skin_unknown_joint"
+ text_color="Orange"
+ top_pad="-17"
+ width="150">
+ Model has an unknown joint(s)
+ </text>
<check_box
follows="top|left"
height="15"
label="Include joint positions"
label_text.text_color="White"
name="upload_joints"
- top_pad="15"/>
+ left_delta="-20"
+ top_pad="1"/>
<check_box
follows="top|left"
height="15"
label="Lock scale if joint position defined"
label_text.text_color="White"
name="lock_scale_if_joint_position"
- top_pad="15"/>
+ top_pad="16"/>
<text
follows="top|left"
height="15"