summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelprofile.cpp
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2020-01-03 05:54:15 +0200
committerAndreyL ProductEngine <alihatskiy@productengine.com>2020-01-03 05:54:15 +0200
commit81c107180bc2698aec10d655111cdb8a584a7a3a (patch)
tree0c248bfc0952e0e5b76d0c643ac002f0515ee135 /indra/newview/llpanelprofile.cpp
parentc32a970cea6390ca037aace33bf546da5bfb9b97 (diff)
SL-12470 Force the feed browser to open the links in the same window
Diffstat (limited to 'indra/newview/llpanelprofile.cpp')
-rw-r--r--indra/newview/llpanelprofile.cpp6
1 files changed, 6 insertions, 0 deletions
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;