diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-02-10 18:29:52 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-02-10 18:29:52 +0200 |
| commit | 6a3cb73009bccdef6ae1fbb5d8b632f90343ad91 (patch) | |
| tree | 6fe381474cffb4668cdbfa2d45a77363af4b95c2 /indra/newview/skins/default | |
| parent | 67b908cd2020231f30386294e4d0c5f199a007a0 (diff) | |
SL-379 Joint overrides tab
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_model_preview.xml | 14 |
1 files changed, 12 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 a69fa8c57c..9ebcb0c09d 100644 --- a/indra/newview/skins/default/xui/en/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml @@ -1279,10 +1279,20 @@ draw_stripes="false" commit_on_selection_change="true" heading_height="23" - height="253" + height="238" left="6" top_pad="0" - width="150"/> + width="200"/> + <text + layout="topleft" + follows="top|left" + height="15" + left="6" + name="conflicts_description" + top_pad="2" + width="200"> + [CONFLICTS] conflicts in [JOINTS_COUNT] joints + </text> <text layout="topleft" follows="top|left" |