diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2022-04-29 18:02:45 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2022-04-29 18:02:45 +0000 |
| commit | 0e0c156bd00a01b38edee803e38b956d4f786701 (patch) | |
| tree | 41dabc7b9c53a17591c8c4d6da93207a52a1b793 /indra/newview/skins/default/xui | |
| parent | b08742d0b3e0000430b8ae772c7c4d25cfe084fa (diff) | |
| parent | cc04903379c3a5dc094e0c9582cf41f022406ef5 (diff) | |
Merged in brad/SL-17116-material-messaging (pull request #958)
brad/SL-17116 material messaging
Approved-by: Euclid Linden
Diffstat (limited to 'indra/newview/skins/default/xui')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_tools.xml | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_tools_texture.xml | 17 |
2 files changed, 17 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 0abee2ff80..44bdcd86f9 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -2,7 +2,7 @@ <floater positioning="cascading" legacy_header_height="18" - height="600" + height="640" layout="topleft" bg_opaque_image="Window_NoTitle_Foreground" bg_alpha_image="Window_NoTitle_Background" @@ -820,7 +820,7 @@ width="282"/> <tab_container follows="left|top" - height="410" + height="460" halign="center" left="0" name="Object Info Tabs" diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml index 9aaac7ac85..85ee736176 100644 --- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml +++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml @@ -2,7 +2,7 @@ <panel border="false" follows="all" - height="420" + height="500" label="Texture" layout="topleft" left="0" @@ -772,7 +772,7 @@ width="260" /> <button left="10" - top="222" + top="257" height="20" label="Align" label_selected="Align current texture layers" @@ -805,4 +805,17 @@ tool_tip="Save material to inventory" width="110" /> + <line_editor + enabled="true" + follows="top|left" + height="16" + layout="topleft" + left="7" + label="Material UUID" + name="materialID" + select_on_focus="true" + top="380" + width="200" + tool_tip="UUID for a material asset" + /> </panel> |