summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2022-11-18 11:45:29 -0600
committerDave Parks <davep@lindenlab.com>2022-11-18 11:45:29 -0600
commit3368fe153e912eb4bf85932c866860fd4b45a1e0 (patch)
tree3a16efaec8b5ca5019be78d97c263bfe8a6fd463 /indra/newview/skins/default
parentb1dabc0f008bf0e6558a93bca2a2d818073a03c1 (diff)
parent7edf1ac66f5004c82d2f219e007d0669062f3df0 (diff)
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/floater_live_material_editor.xml2
-rw-r--r--indra/newview/skins/default/xui/en/floater_material_editor.xml1
2 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_live_material_editor.xml b/indra/newview/skins/default/xui/en/floater_live_material_editor.xml
index 7759bc2399..5b7dab6a52 100644
--- a/indra/newview/skins/default/xui/en/floater_live_material_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_live_material_editor.xml
@@ -22,6 +22,8 @@
layout="topleft"
color="DkGray2"
opaque="true"
+ tab_stop="true"
+ border="false"
reserve_scroll_corner="false">
<panel
name="panel_material"
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 1a53d7832d..5b67fea19d 100644
--- a/indra/newview/skins/default/xui/en/floater_material_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_material_editor.xml
@@ -27,6 +27,7 @@
layout="topleft"
color="DkGray2"
opaque="true"
+ tab_stop="true"
border="false"
reserve_scroll_corner="false">
<panel