diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-06-25 16:50:23 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-06-25 16:50:23 +0300 |
| commit | 63daefb39afba64110a48572ac629c83fb31a7c7 (patch) | |
| tree | 65cc9ff1e1d2529e2a48e0c69422794d23b6a022 /indra/newview/skins/default | |
| parent | 5cf5aa44cabf9bc142551e568c2e69954d06640f (diff) | |
SL-17640 Materials Upload UI #3
Fixed issues in button layout
Added 'unsaved changes' notification
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_material_editor.xml | 19 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 17 |
2 files changed, 28 insertions, 8 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_material_editor.xml b/indra/newview/skins/default/xui/en/floater_material_editor.xml index 815a53a887..36315d3b04 100644 --- a/indra/newview/skins/default/xui/en/floater_material_editor.xml +++ b/indra/newview/skins/default/xui/en/floater_material_editor.xml @@ -27,7 +27,7 @@ layout="topleft" left="5" mouse_opaque="false" - name="Texture" + name="albedo_texture_pnl" top_pad="5" > <text @@ -182,7 +182,7 @@ layout="topleft" left="5" mouse_opaque="false" - name="Texture" + name="metallic_texture_pnl" top_pad="5" > <text @@ -283,7 +283,7 @@ layout="topleft" left="5" mouse_opaque="false" - name="Texture" + name="emissive_texture_pnl" top_pad="5" > <text @@ -379,6 +379,7 @@ left="5" mouse_opaque="false" top_pad="5" + name="normal_texture_pnl" > <text type="string" @@ -423,15 +424,17 @@ <panel follows="right|bottom" width="246" - height="82" + height="97" layout="bottomright" top_delta="-2" - left="0" + left="5" name="button_panel" > <text type="string" + name="unsaved_changes" font.style="BOLD" + text_color="DrYellow" length="1" follows="left|top" height="10" @@ -449,7 +452,7 @@ layout="topleft" name="save" top_pad="7" - left="5" + left="0" width="120" /> <button follows="left|top" @@ -466,7 +469,7 @@ length="1" follows="left|top" height="10" - width="240" + width="220" layout="topleft" left="10" top_pad="5" @@ -478,7 +481,7 @@ bevel_style="none" height="0" layout="topleft" - left="5" + left="0" name="button_border" top_pad="7" width="246"/> diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 23a9632ada..0ca3e043e7 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -9068,6 +9068,23 @@ Please enter a non-empty name <notification icon="alertmodal.tga" + name="UsavedMaterialChanges" + type="alertmodal"> + You have unsaved changes. + <form name="form"> + <button + index="0" + name="discard" + text="Discard changes"/> + <button + index="1" + name="keep" + text="Keep editing"/> + </form> + </notification> + + <notification + icon="alertmodal.tga" name="LivePreviewUnavailable" type="alert"> |