livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix XUI parser warnings: 

* LLFloaterMarketplace::postBuild calls parent method which already tries to find the webbrowser control with a different name and adds itself as observer
* Incorrect attribute name "tooltip" in panel_preferences_move.xml
master
Ansariel 2025-10-31 16:39:17 +01:00 committed by Andrey Kleshchev
parent d23379939c
commit 11ccdb5e32
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llfloatermarketplace.cpp
View File

@ -46,9 +46,9 @@ void LLFloaterMarketplace::onClose(bool app_quitting)
bool LLFloaterMarketplace::postBuild() bool LLFloaterMarketplace::postBuild()
{ {
LLFloaterWebContent::postBuild(); if (!LLFloaterWebContent::postBuild())
mWebBrowser = getChild<LLMediaCtrl>("marketplace_contents"); return false;
mWebBrowser->addObserver(this);
mWebBrowser->setErrorPageURL(gSavedSettings.getString("GenericErrorPageURL")); mWebBrowser->setErrorPageURL(gSavedSettings.getString("GenericErrorPageURL"));
std::string url = gSavedSettings.getString("MarketplaceURL"); std::string url = gSavedSettings.getString("MarketplaceURL");
mWebBrowser->navigateTo(url, HTTP_CONTENT_TEXT_HTML); mWebBrowser->navigateTo(url, HTTP_CONTENT_TEXT_HTML);

2
indra/newview/skins/default/xui/en/floater_marketplace.xml
View File

@ -169,7 +169,7 @@
follows="all" follows="all"
layout="topleft" layout="topleft"
left="0" left="0"
name="marketplace_contents" name="webbrowser"
top="0"/> top="0"/>
</layout_panel> </layout_panel>
<layout_panel name="status_bar" <layout_panel name="status_bar"

2
indra/newview/skins/default/xui/en/panel_preferences_move.xml
View File

@ -214,7 +214,7 @@
left_pad="10" left_pad="10"
top_delta="-6" top_delta="-6"
name="mouse_warp_combo" 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"> width="200">
<combo_box.item <combo_box.item
label="Automatic" label="Automatic"