diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-11-05 12:01:03 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-11-05 12:01:03 +0800 |
| commit | c8df8ed7d077d7e555d76a232b0b77c1665fc030 (patch) | |
| tree | a184c9c7c4b74c513bf9e86c5d1a5af52824d103 /indra/newview/skins | |
| parent | 238e0e4e1501c5a82f6798f40e0253848c09645c (diff) | |
| parent | 5e11448e4fccb56d03eb9a7b18774b8c550683b7 (diff) | |
Merge tag 'Second_Life_Release#5e11448e-2025.08' into 2025.08
Diffstat (limited to 'indra/newview/skins')
3 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_marketplace.xml b/indra/newview/skins/default/xui/en/floater_marketplace.xml index 99fb3a1ad8..40bf674d2d 100644 --- a/indra/newview/skins/default/xui/en/floater_marketplace.xml +++ b/indra/newview/skins/default/xui/en/floater_marketplace.xml @@ -169,7 +169,7 @@ follows="all" layout="topleft" left="0" - name="marketplace_contents" + name="webbrowser" top="0"/> </layout_panel> <layout_panel name="status_bar" diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml index 43c4aa1b9d..8891ebcd87 100644 --- a/indra/newview/skins/default/xui/en/floater_search.xml +++ b/indra/newview/skins/default/xui/en/floater_search.xml @@ -170,7 +170,7 @@ layout="topleft" left="0" trusted_content="true" - name="search_contents" + name="webbrowser" top="0"/> </layout_panel> <layout_panel name="status_bar" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml index 1de660078f..eee55bd7bc 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml @@ -214,7 +214,7 @@ left_pad="10" top_delta="-6" name="mouse_warp_combo" - tooltip="Controls warping of the mouse to the center of the screen during alt-zoom and mouse look." + tool_tip="Controls warping of the mouse to the center of the screen during alt-zoom and mouse look." width="200"> <combo_box.item label="Automatic" |