diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2020-01-03 05:54:15 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2020-01-03 05:54:15 +0200 |
| commit | 81c107180bc2698aec10d655111cdb8a584a7a3a (patch) | |
| tree | 0c248bfc0952e0e5b76d0c643ac002f0515ee135 /indra | |
| parent | c32a970cea6390ca037aace33bf546da5bfb9b97 (diff) | |
SL-12470 Force the feed browser to open the links in the same window
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llmediactrl.cpp | 9 | ||||
| -rw-r--r-- | indra/newview/llpanelprofile.cpp | 6 |
2 files changed, 14 insertions, 1 deletions
diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp index b399ab9bc4..3bfb432a9b 100644 --- a/indra/newview/llmediactrl.cpp +++ b/indra/newview/llmediactrl.cpp @@ -1022,7 +1022,14 @@ void LLMediaCtrl::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event) // try as slurl first if (!LLURLDispatcher::dispatch(url, "clicked", NULL, mTrusted)) { - LLWeb::loadURL(url, target, uuid); + if (self->isOverrideClickTarget() && target == "_navigate") + { + navigateTo(url, HTTP_CONTENT_TEXT_HTML); + } + else + { + LLWeb::loadURL(url, target, uuid); + } } // CP: removing this code because we no longer support popups so this breaks the flow. diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp index 0e50e8bdd0..cc5332a7db 100644 --- a/indra/newview/llpanelprofile.cpp +++ b/indra/newview/llpanelprofile.cpp @@ -854,6 +854,11 @@ void LLPanelProfileWeb::onOpen(const LLSD& key) resetData(); mAvatarNameCacheConnection = LLAvatarNameCache::get(getAvatarId(), boost::bind(&LLPanelProfileWeb::onAvatarNameCache, this, _1, _2)); + + if (mWebBrowser->getMediaPlugin()) + { + mWebBrowser->getMediaPlugin()->setOverrideClickTarget("_navigate"); + } } BOOL LLPanelProfileWeb::postBuild() @@ -1000,6 +1005,7 @@ void LLPanelProfileWeb::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent e LLStringUtil::format_map_t args; args["[TIME]"] = llformat("%.2f", mPerformanceTimer.getElapsedTimeF32()); childSetValue("status_text", LLSD( getString("LoadTime", args)) ); + resetLoading(); } break; |