summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2024-06-11 09:12:59 +0800
committerErik Kundiman <erik@megapahit.org>2024-06-11 09:12:59 +0800
commit0b211fe35c0b53f49fc4c5e1e62cec501184e13d (patch)
tree1bfcc95b5c80a5c0a2898659214bdd595b03fa72 /indra/newview/skins/default/xui
parentdedd91fdcabe5af455bbbb1cb0149aea30b0faf9 (diff)
parent010ea698e53516bf242e5ff5f66336cf2a3eac02 (diff)
Merge remote-tracking branch 'fowlerdm/main'
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/floater_im_session.xml3
-rw-r--r--indra/newview/skins/default/xui/en/floater_world_map.xml2
2 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 412c8febdc..c46cc4f504 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -290,8 +290,7 @@
font="SansSerifSmall"
height="20"
is_expandable="true"
- bg_alpha_color="Transparent"
- background_visible="false"
+ text_tentative_color="TextFgTentativeColor"
name="chat_editor"
max_length="1023"
spellcheck="true"
diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index df12b8f58a..b3f672d51a 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -54,7 +54,7 @@
layout="topleft"
left_pad="-29"
name="expand_btn_panel"
- background_visible="false"
+ background_visible="true"
bg_opaque_color="FloaterFocusBackgroundColor"
bg_alpha_color="FloaterDefaultBackgroundColor"
background_opaque="true"