diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-02-05 19:33:36 +0200 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-02-05 19:38:00 +0200 |
commit | ad1052039cfdd0e9a95304874cf1347e1472d36f (patch) | |
tree | b04e8c9629f067995c21444096b645ffcd8f0526 /indra/newview/llpanelprofile.cpp | |
parent | d956c866cf5f633668f6e81996f7ddb8481eae1c (diff) |
SL-12550 Profile feed tab cleanup
SL-12550 Profile feed tab cleanup
Diffstat (limited to 'indra/newview/llpanelprofile.cpp')
-rw-r--r-- | indra/newview/llpanelprofile.cpp | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp index 0e50e8bdd0..2cd5aecc2e 100644 --- a/indra/newview/llpanelprofile.cpp +++ b/indra/newview/llpanelprofile.cpp @@ -858,19 +858,10 @@ void LLPanelProfileWeb::onOpen(const LLSD& key) BOOL LLPanelProfileWeb::postBuild() { - mUrlEdit = getChild<LLLineEditor>("url_edit"); - mLoadButton = getChild<LLUICtrl>("load"); - mWebProfileButton = getChild<LLButton>("web_profile_popout_btn"); - - mLoadButton->setCommitCallback(boost::bind(&LLPanelProfileWeb::onCommitLoad, this, _1)); - mWebProfileButton->setCommitCallback(boost::bind(&LLPanelProfileWeb::onCommitWebProfile, this)); - mWebBrowser = getChild<LLMediaCtrl>("profile_html"); mWebBrowser->addObserver(this); mWebBrowser->setHomePageUrl("about:blank"); - mUrlEdit->setEnabled(FALSE); - return TRUE; } @@ -881,9 +872,6 @@ void LLPanelProfileWeb::processProperties(void* data, EAvatarProcessorType type) const LLAvatarData* avatar_data = static_cast<const LLAvatarData*>(data); if (avatar_data && getAvatarId() == avatar_data->avatar_id) { - mURLHome = avatar_data->profile_url; - mUrlEdit->setValue(mURLHome); - mLoadButton->setEnabled(mURLHome.length() > 0); updateButtons(); } } @@ -891,14 +879,12 @@ void LLPanelProfileWeb::processProperties(void* data, EAvatarProcessorType type) void LLPanelProfileWeb::resetData() { - mURLHome = LLStringUtil::null; - mUrlEdit->setValue(mURLHome); mWebBrowser->navigateHome(); } void LLPanelProfileWeb::apply(LLAvatarData* data) { - data->profile_url = mUrlEdit->getValue().asString(); + } void LLPanelProfileWeb::updateData() @@ -962,12 +948,6 @@ void LLPanelProfileWeb::onCommitLoad(LLUICtrl* ctrl) } } -void LLPanelProfileWeb::onCommitWebProfile() -{ - // open the web profile floater - LLAvatarActions::showProfileWeb(getAvatarId()); -} - void LLPanelProfileWeb::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event) { switch(event) @@ -976,12 +956,6 @@ void LLPanelProfileWeb::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent e childSetValue("status_text", LLSD( self->getStatusText() ) ); break; - case MEDIA_EVENT_LOCATION_CHANGED: - // don't set this or user will set there url to profile url - // when clicking ok on there own profile. - // childSetText("url_edit", self->getLocation() ); - break; - case MEDIA_EVENT_NAVIGATE_BEGIN: { if (mFirstNavigate) @@ -1012,11 +986,6 @@ void LLPanelProfileWeb::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent e void LLPanelProfileWeb::updateButtons() { LLPanelProfileTab::updateButtons(); - - if (getSelfProfile() && !getEmbedded()) - { - mUrlEdit->setEnabled(TRUE); - } } ////////////////////////////////////////////////////////////////////////// |