diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-05-17 18:05:05 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-05-17 18:05:05 +0300 |
| commit | 033b04f3883a0cc9024f45b5e9a0d792cf6dbb77 (patch) | |
| tree | ac49627e31aabda8aaa4b21c74c5aee2b2ea46e8 /indra/newview/skins/default/xui/en | |
| parent | 07dc391ab76a8860d04bfb001cdc686cd576663d (diff) | |
| parent | 5a70639b7992842a9f74ec81b11bac56608b8f2e (diff) | |
Merge branch 'main' into DRTVWR-582-maint-U
# Conflicts:
# indra/newview/llagentlistener.cpp
# indra/newview/llcommanddispatcherlistener.cpp
# indra/newview/llfilepicker_mac.mm
# indra/newview/llworldmapview.cpp
Diffstat (limited to 'indra/newview/skins/default/xui/en')
3 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml index 4985d07eb9..b1ed245378 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -1606,7 +1606,7 @@ Only large parcels can be listed in search. follows="left|top" height="16" layout="topleft" - left_pad="-134" + left_pad="6" name="mime_type" width="200" /> <text diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml index 35bd736d77..f4181b2152 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml @@ -67,7 +67,7 @@ <text layout="topleft" - left="345" + left="389" height="12" name="font_size" width="120" @@ -79,7 +79,7 @@ control_name="ChatFontSize" height="23" layout="topleft" - left="341" + left="385" name="chat_font_size" top_pad="5" width="100"> @@ -103,7 +103,7 @@ label="Bubble Chat" layout="topleft" top_pad="4" - left_delta="0" + left="340" name="bubble_text_chat" width="330"> </check_box> diff --git a/indra/newview/skins/default/xui/en/widgets/wearable_outfit_list_item.xml b/indra/newview/skins/default/xui/en/widgets/wearable_outfit_list_item.xml index cd84b91b1f..866276f997 100644 --- a/indra/newview/skins/default/xui/en/widgets/wearable_outfit_list_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/wearable_outfit_list_item.xml @@ -41,6 +41,7 @@ width="359" /> <add_btn name="add_wearable" + visible="false" layout="topleft" follows="top|right" image_unselected="Add_Icon" @@ -52,6 +53,7 @@ tab_stop="false" /> <remove_btn name="remove_wearable" + visible="false" layout="topleft" follows="top|right" image_unselected="Remove_Icon" |