summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorGeenz <geenz@geenzo.com>2019-03-29 09:32:24 -0700
committerGeenz <geenz@geenzo.com>2019-03-29 09:32:24 -0700
commit4e86079008761b025f848a5d9977823d3a27e92d (patch)
tree30c926375b5206edd4a9d1f1c0fe8aec2bdb42f2 /indra/newview/skins/default
parent57d88a8a98ef8663b9064b12143beb4068e58f86 (diff)
parentad236703a61dae0ce4f4aa09282d8882daed23f4 (diff)
Merge with upstream at https://bitbucket.org/rider_linden/viewer-eep
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/panel_region_environment.xml10
-rw-r--r--indra/newview/skins/default/xui/en/widgets/line_editor.xml1
2 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml
index bac27f7457..4d4ee7d730 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -253,6 +253,8 @@
height="20"
layout="topleft"
name="edt_invname_alt1"
+ use_bg_color="true"
+ bg_color="TextBgReadOnlyColor"
width="155">
Unknown
</line_editor>
@@ -297,6 +299,8 @@
height="20"
layout="topleft"
name="edt_invname_alt2"
+ use_bg_color="true"
+ bg_color="TextBgReadOnlyColor"
width="155">
Unknown
</line_editor>
@@ -342,6 +346,8 @@
height="20"
layout="topleft"
name="edt_invname_alt3"
+ use_bg_color="true"
+ bg_color="TextBgReadOnlyColor"
width="155">
Unknown
</line_editor>
@@ -460,6 +466,8 @@
height="20"
layout="topleft"
name="edt_invname_ground"
+ use_bg_color="true"
+ bg_color="TextBgReadOnlyColor"
width="155">
Unknown
</line_editor>
@@ -514,6 +522,8 @@
height="20"
layout="topleft"
name="edt_invname_water"
+ use_bg_color="true"
+ bg_color="TextBgReadOnlyColor"
width="155">
Unknown
</line_editor>
diff --git a/indra/newview/skins/default/xui/en/widgets/line_editor.xml b/indra/newview/skins/default/xui/en/widgets/line_editor.xml
index a054960bf8..f39e086196 100644
--- a/indra/newview/skins/default/xui/en/widgets/line_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/line_editor.xml
@@ -6,6 +6,7 @@
commit_on_focus_lost="true"
ignore_tab="true"
cursor_color="TextCursorColor"
+ bg_color="White"
text_color="TextFgColor"
text_pad_left="2"
text_readonly_color="TextFgReadOnlyColor"