merge up from viewer-pre-beta

1 files changed, 1 insertions, 61 deletions

diff --git a/indra/newview/llpanelme.cpp b/indra/newview/llpanelme.cpp
index 1347a02a52..7e47a96f44 100644
--- a/indra/newview/llpanelme.cpp
+++ b/indra/newview/llpanelme.cpp
@@ -37,7 +37,6 @@
 #include "llfirstuse.h"
 #include "llfloaterreg.h"
 #include "llhints.h"
-#include "llsidetray.h"
 #include "llviewercontrol.h"
 #include "llviewerdisplayname.h"
 
@@ -73,59 +72,6 @@ BOOL LLPanelMe::postBuild()
 void LLPanelMe::onOpen(const LLSD& key)
 {
 	LLPanelProfile::onOpen(key);
-
-	// Removed this action as per SOCIAL-431 The first time a new resident opens the profile tab 
-	//                                       in the sidebar, they see the old profile editing panel
-	//
-	//// Force Edit My Profile if this is the first time when user is opening Me Panel (EXT-5068)
-	//bool opened = gSavedSettings.getBOOL("MePanelOpened");
-	//// In some cases Side Tray my call onOpen() twice, check getCollapsed() to be sure this
-	//// is the last time onOpen() is called
-	//if( !opened && !LLSideTray::getInstance()->getCollapsed() )
-	//{
-	//	buildEditPanel();
-	//	openPanel(mEditPanel, getAvatarId());
-	//	gSavedSettings.setBOOL("MePanelOpened", true);
-	//}
-}
-
-bool LLPanelMe::notifyChildren(const LLSD& info)
-{
-	if (info.has("task-panel-action") && info["task-panel-action"].asString() == "handle-tri-state")
-	{
-		// Implement task panel tri-state behavior.
-		//
-		// When the button of an active open task panel is clicked, side tray
-		// calls notifyChildren() on the panel, passing task-panel-action=>handle-tri-state as an argument.
-		// The task panel is supposed to handle this by reverting to the default view,
-		// i.e. closing any dependent panels like "pick info" or "profile edit".
-
-		bool on_default_view = true;
-
-		const LLRect& task_panel_rect = getRect();
-		for (LLView* child = getFirstChild(); child; child = findNextSibling(child))
-		{
-			LLPanel* panel = dynamic_cast<LLPanel*>(child);
-			if (!panel)
-				continue;
-
-			// *HACK: implement panel stack instead (e.g. me->pick_info->pick_edit).
-			if (panel->getRect().getWidth()  == task_panel_rect.getWidth()  &&
-				panel->getRect().getHeight() == task_panel_rect.getHeight() &&
-				panel->getVisible())
-			{
-				panel->setVisible(FALSE);
-				on_default_view = false;
-			}
-		}
-		
-		if (on_default_view)
-			LLSideTray::getInstance()->collapseSideBar();
-
-		return true; // this notification is only supposed to be handled by task panels 
-	}
-
-	return LLPanel::notifyChildren(info);
 }
 
 void LLPanelMe::buildEditPanel()
@@ -138,7 +84,7 @@ void LLPanelMe::buildEditPanel()
 		//       All profile editing should go through the web.
 		//mEditPanel->childSetAction("save_btn", boost::bind(&LLPanelMe::onSaveChangesClicked, this), this);
 
-		mEditPanel->childSetAction("cancel_btn", boost::bind(&LLPanelMe::onCancelClicked, this), this);
+		//mEditPanel->childSetAction("cancel_btn", boost::bind(&LLPanelMe::onCancelClicked, this), this);
 	}
 }
 
@@ -146,12 +92,6 @@ void LLPanelMe::buildEditPanel()
 void LLPanelMe::onEditProfileClicked()
 {
 	buildEditPanel();
-	togglePanel(mEditPanel, getAvatarId()); // open
-}
-
-void LLPanelMe::onCancelClicked()
-{
-	togglePanel(mEditPanel); // close
 }
 
 //////////////////////////////////////////////////////////////////////////