Skip to content

Fix XUI parser warnings: #4917

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 4, 2025
Merged

Fix XUI parser warnings: #4917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9fce58
Fix XUI parser warnings:
Ansariel Oct 31, 2025
224c22a
Use correct widget name for marketplace floater
Ansariel Nov 4, 2025
3e5b189
Fix remaining cases of webbrowser-related XUI warnings
Ansariel Nov 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions indra/newview/llfloatermarketplace.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ void LLFloaterMarketplace::onClose(bool app_quitting)

bool LLFloaterMarketplace::postBuild()
{
LLFloaterWebContent::postBuild();
mWebBrowser = getChild<LLMediaCtrl>("marketplace_contents");
mWebBrowser->addObserver(this);
if (!LLFloaterWebContent::postBuild())
return false;

mWebBrowser->setErrorPageURL(gSavedSettings.getString("GenericErrorPageURL"));
std::string url = gSavedSettings.getString("MarketplaceURL");
mWebBrowser->navigateTo(url, HTTP_CONTENT_TEXT_HTML);
Expand Down
9 changes: 4 additions & 5 deletions indra/newview/llfloatersearch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,15 +161,14 @@ void LLFloaterSearch::initiateSearch(const LLSD& tokens)

// Naviation to the calculated URL - we know it's HTML so we can
// tell the media system not to bother with the MIME type check.
LLMediaCtrl* search_browser = findChild<LLMediaCtrl>("search_contents");
search_browser->navigateTo(url, HTTP_CONTENT_TEXT_HTML);
mWebBrowser->navigateTo(url, HTTP_CONTENT_TEXT_HTML);
}

bool LLFloaterSearch::postBuild()
{
LLFloaterWebContent::postBuild();
mWebBrowser = getChild<LLMediaCtrl>("search_contents");
mWebBrowser->addObserver(this);
if (!LLFloaterWebContent::postBuild())
return false;

mWebBrowser->setErrorPageURL(gSavedSettings.getString("GenericErrorPageURL"));

// If cookie is there, will set it now, Otherwise will have to wait for login completion
Expand Down
4 changes: 2 additions & 2 deletions indra/newview/llviewermedia.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1364,8 +1364,8 @@ void LLViewerMedia::getOpenIDCookieCoro(std::string url)
std::string browser_name;
};
struct MediaCookieInstance media_cookie_instances[] = {
{"search", "search_contents" },
{"marketplace", "marketplace_contents" },
{"search", "webbrowser" },
{"marketplace", "webbrowser" },
{"destinations", "destination_guide_contents" },
};
for (MediaCookieInstance mci : media_cookie_instances)
Expand Down
2 changes: 1 addition & 1 deletion indra/newview/skins/default/xui/en/floater_marketplace.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@
follows="all"
layout="topleft"
left="0"
name="marketplace_contents"
name="webbrowser"
Copy link
Contributor

@akleshchev akleshchev Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two other places are also using marketplace_contents, in llviewermedia.cpp and llviewerwindow.cpp

Copy link
Contributor Author

@Ansariel Ansariel Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There was only one in llviewermedia.cpp - fixed that.

Copy link
Contributor

@akleshchev akleshchev Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, sorry, it's there in develop, but was removed in 2025.08

Copy link
Contributor

@akleshchev akleshchev Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The same problem is probably present in LLFloaterSearch::postBuild()

Copy link
Contributor Author

@Ansariel Ansariel Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aaaaaaand fixed those as well.

Question: Why is it everytime I open search I have to click the cookie banner thing away? This also happens on current release and is unrelated to these changes.

Copy link
Contributor

@akleshchev akleshchev Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This also happens on current release and is unrelated to these changes.

I think 2025.07 is removing cef's folder each launch or something like that. #4908

Copy link
Contributor Author

@Ansariel Ansariel Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This also happens on current release and is unrelated to these changes.

I think 2025.07 is removing cef's folder each launch or something like that. #4908

But it also happens in release 7.2.1 - which AFAIK is 2025.06 - and before.

Copy link
Contributor

@akleshchev akleshchev Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think before 7.2.2 it was a problem with cef instances being locked from files by each other since they were sharing those files. Only one instance could use the files. In 7.2.2 they got individual directories for that. But I'm not entirely in the loop on the topic of cef, so I might be wrong.

top="0"/>
</layout_panel>
<layout_panel name="status_bar"
Expand Down
2 changes: 1 addition & 1 deletion indra/newview/skins/default/xui/en/floater_search.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion indra/newview/skins/default/xui/en/panel_preferences_move.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down