Align the web browser search element name in the FS search floater with the SL viewer one
This squashes 'LLView::getChild : Making dummy class LLMediaCtrl named "webbrowser" in floater_fs_search'
See 5e11448e4f
Signed-off-by: PanteraPolnocy <panterapolnocy@gmail.com>
master
parent
215412e28a
commit
b6253a7da4
|
|
@ -2962,7 +2962,9 @@ FSPanelSearchWeb::FSPanelSearchWeb() : FSSearchPanelBase()
|
|||
|
||||
bool FSPanelSearchWeb::postBuild()
|
||||
{
|
||||
mWebBrowser = getChild<LLMediaCtrl>("search_contents");
|
||||
mWebBrowser = getChild<LLMediaCtrl>("webbrowser");
|
||||
mWebBrowser->setErrorPageURL(gSavedSettings.getString("GenericErrorPageURL"));
|
||||
LLViewerMedia::getInstance()->getOpenIDCookie(mWebBrowser);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2600,6 +2600,11 @@ bool LLPanelProfileWeb::postBuild()
|
|||
mWebBrowser->addObserver(this);
|
||||
mWebBrowser->setHomePageUrl("about:blank");
|
||||
|
||||
// <FS:PP> Load cookies in the profile, in feed tab
|
||||
mWebBrowser->setErrorPageURL(gSavedSettings.getString("GenericErrorPageURL"));
|
||||
LLViewerMedia::getInstance()->getOpenIDCookie(mWebBrowser);
|
||||
// </FS:PP>
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1375,6 +1375,7 @@ void LLViewerMedia::getOpenIDCookieCoro(std::string url)
|
|||
{"search", "webbrowser" },
|
||||
{"marketplace", "webbrowser" },
|
||||
{"destinations", "destination_guide_contents" },
|
||||
{"avatarinfo", "profile_html" }, // <FS:PP> Load openId cookie in the profile, in feed tab
|
||||
};
|
||||
for (MediaCookieInstance mci : media_cookie_instances)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ name="panel_ls_web">
|
|||
right="-5"
|
||||
layout="topleft"
|
||||
follows="all"
|
||||
name="search_contents"
|
||||
name="webbrowser"
|
||||
trusted_content="true"
|
||||
start_url="about:blank" />
|
||||
</panel>
|
||||
Loading…
Reference in New Issue