diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-02-05 18:32:29 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-02-05 18:32:29 +0200 |
| commit | 1d1f2e95f2da9cd530f2336a8e661d16a512c064 (patch) | |
| tree | b9322617e8d870afbf581e141f5c9a26c60d6861 /indra/newview | |
| parent | 81c107180bc2698aec10d655111cdb8a584a7a3a (diff) | |
Revert "SL-12470 Force the feed browser to open the links in the same window"
This reverts commit 81c107180bc2698aec10d655111cdb8a584a7a3a.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llmediactrl.cpp | 9 | ||||
| -rw-r--r-- | indra/newview/llpanelprofile.cpp | 6 |
2 files changed, 1 insertions, 14 deletions
diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp index 3bfb432a9b..b399ab9bc4 100644 --- a/indra/newview/llmediactrl.cpp +++ b/indra/newview/llmediactrl.cpp @@ -1022,14 +1022,7 @@ void LLMediaCtrl::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event) // try as slurl first if (!LLURLDispatcher::dispatch(url, "clicked", NULL, mTrusted)) { - if (self->isOverrideClickTarget() && target == "_navigate") - { - navigateTo(url, HTTP_CONTENT_TEXT_HTML); - } - else - { - LLWeb::loadURL(url, target, uuid); - } + 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 cc5332a7db..0e50e8bdd0 100644 --- a/indra/newview/llpanelprofile.cpp +++ b/indra/newview/llpanelprofile.cpp @@ -854,11 +854,6 @@ 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() @@ -1005,7 +1000,6 @@ 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; |