From b1ac8092eecf5fc9dc4b4867370a51e5dfba4331 Mon Sep 17 00:00:00 2001 From: AndreyL ProductEngine Date: Wed, 13 Nov 2019 09:31:26 +0200 Subject: SL-10790 Don't show excessive information on the Profile Feed tab --- indra/newview/llpanelprofile.cpp | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'indra/newview/llpanelprofile.cpp') diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp index 1b3462176e..1620a01d1c 100644 --- a/indra/newview/llpanelprofile.cpp +++ b/indra/newview/llpanelprofile.cpp @@ -904,16 +904,13 @@ void LLPanelProfileWeb::apply(LLAvatarData* data) void LLPanelProfileWeb::updateData() { LLUUID avatar_id = getAvatarId(); - if (!getIsLoading() && avatar_id.notNull()) + if (!getIsLoading() && avatar_id.notNull() && !mURLWebProfile.empty()) { setIsLoading(); - if (!mURLWebProfile.empty()) - { - mWebBrowser->setVisible(TRUE); - mPerformanceTimer.start(); - mWebBrowser->navigateTo(mURLWebProfile, HTTP_CONTENT_TEXT_HTML); - } + mWebBrowser->setVisible(TRUE); + mPerformanceTimer.start(); + mWebBrowser->navigateTo(mURLWebProfile, HTTP_CONTENT_TEXT_HTML); } } @@ -931,17 +928,14 @@ void LLPanelProfileWeb::onAvatarNameCache(const LLUUID& agent_id, const LLAvatar LLStringUtil::replaceChar(username, ' ', '.'); } - mURLWebProfile = getProfileURL(username); + mURLWebProfile = getProfileURL(username, true); if (mURLWebProfile.empty()) { return; } //if the tab was opened before name was resolved, load the panel now - if (getIsLoading()) - { - updateData(); - } + updateData(); } void LLPanelProfileWeb::onCommitLoad(LLUICtrl* ctrl) -- cgit v1.2.3