SL-12550 Profile feed tab cleanup

SL-12550 Profile feed tab cleanup

5 files changed, 2 insertions, 104 deletions

diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index bc9dc968f2..590787c411 100644
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -438,16 +438,6 @@ LLFloater* LLAvatarActions::getProfileFloater(const LLUUID& avatar_id)
     return floater;
 }
 
-// static
-void LLAvatarActions::showProfileWeb(const LLUUID& avatar_id)
-{
-    if (avatar_id.notNull())
-    {
-        LLAvatarNameCache::get(avatar_id, boost::bind(&on_avatar_name_show_profile, _1, _2));
-    }
-}
-
-
 //static 
 void LLAvatarActions::hideProfile(const LLUUID& avatar_id)
 {
diff --git a/indra/newview/llavataractions.h b/indra/newview/llavataractions.h
index ff2617bcdd..d84f2ef1bb 100644
--- a/indra/newview/llavataractions.h
+++ b/indra/newview/llavataractions.h
@@ -105,7 +105,6 @@ public:
     static bool profileVisible(const LLUUID& avatar_id);
     static bool isPickTabSelected(const LLUUID& avatar_id);
     static LLFloater* getProfileFloater(const LLUUID& avatar_id);
-    static void showProfileWeb(const LLUUID& avatar_id);
 
 	/**
 	 * Show avatar on world map.
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);
-    }
 }
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/indra/newview/llpanelprofile.h b/indra/newview/llpanelprofile.h
index d4f9499894..31fbc4c46b 100644
--- a/indra/newview/llpanelprofile.h
+++ b/indra/newview/llpanelprofile.h
@@ -247,15 +247,12 @@ public:
 protected:
 	/*virtual*/ void updateButtons();
 	void onCommitLoad(LLUICtrl* ctrl);
-	void onCommitWebProfile();
 
 private:
 	std::string			mURLHome;
 	std::string			mURLWebProfile;
 	LLMediaCtrl*		mWebBrowser;
 	LLButton*			mWebProfileButton;
-	LLUICtrl*			mLoadButton;
-	LLLineEditor*		mUrlEdit;
 
 	LLFrameTimer		mPerformanceTimer;
 	bool				mFirstNavigate;
diff --git a/indra/newview/skins/default/xui/en/panel_profile_web.xml b/indra/newview/skins/default/xui/en/panel_profile_web.xml
index 97e245dc24..af2ac57f58 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_web.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_web.xml
@@ -13,66 +13,9 @@
      name="LoadTime"
      value="Load Time: [TIME] seconds"
     />
-    <line_editor
-     name="url_edit"
-     enabled="false"
-     top_pad="5"
-     left="10"
-     height="16"
-     width="400"
-     follows="left|top"
-     layout="topleft"
-     text_pad_left="4"
-     max_length_bytes="254"
-    >
-        (loading..)
-    </line_editor>
-    <flyout_button
-     name="load"
-     label="Load"
-     tool_tip="Load this profile page with embedded web browser."
-     enabled="false"
-     top_pad="5"
-     left="10"
-     height="18"
-     width="80"
-     follows="left|top"
-     layout="topleft"
-    >
-        <flyout_button.item
-         name="open_item"
-         label="Open in-viewer browser"
-         value="popout"
-        />
-        <flyout_button.item
-         name="home_item"
-         label="Open external browser"
-         value="external"
-        />
-    </flyout_button>
-    <loading_indicator
-     name="progress_indicator"
-     left_pad="100"
-     height="23"
-     width="23"
-     follows="top|left"
-     layout="topleft"
-     visible="false"
-    />
-    <button
-     name="web_profile_popout_btn"
-     top_delta="5"
-     right="-10"
-     height="16"
-     width="16"
-     follows="right|top"
-     layout="topleft"
-     image_overlay="tearoffbox.tga"
-     tool_tip="Popout web profile"
-    />
     <web_browser
      name="profile_html"
-     top="48"
+     top="10"
      bottom="-18"
      left="10"
      right="-10"