summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorJonathan "Geenz" Goodman <geenz@geenzo.com>2023-03-27 15:06:27 -0700
committerJonathan "Geenz" Goodman <geenz@geenzo.com>2023-03-27 15:06:27 -0700
commit91a9a94df115fa2a69abb6cb1a6eacb569f08eef (patch)
tree5afcc8e94c37d0aa5dc680ce32b0510ba429ef69 /indra/newview/skins
parent6c554c9c92a0150fdf5a177bf33269eac8341d02 (diff)
parentc20058b7a7207cb80426796d9d77864c696a5eec (diff)
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/floater_material_editor.xml1
1 files changed, 0 insertions, 1 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 1c58ea6977..a6a401f43e 100644
--- a/indra/newview/skins/default/xui/en/floater_material_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_material_editor.xml
@@ -29,7 +29,6 @@
color="DkGray2"
opaque="true"
tab_stop="true"
- border="false"
reserve_scroll_corner="false">
<panel
name="panel_material"