Merge recent changes

1 files changed, 11 insertions, 22 deletions

diff --git a/indra/newview/llpanelplacestab.cpp b/indra/newview/llpanelplacestab.cpp
index 2b38aa0890..7c0a7b0cc4 100644
--- a/indra/newview/llpanelplacestab.cpp
+++ b/indra/newview/llpanelplacestab.cpp
@@ -31,14 +31,24 @@
 
 #include "llviewerprecompiledheaders.h"
 
+#include "llpanelplacestab.h"
+
 #include "llwindow.h"
 
 #include "llnotifications.h"
 
+#include "llbutton.h"
 #include "llslurl.h"
-#include "llpanelplacestab.h"
 #include "llworldmap.h"
 
+bool LLPanelPlacesTab::isTabVisible()
+{
+	LLUICtrl* parent = getParentUICtrl();
+	if (!parent) return false;
+	if (!parent->getVisible()) return false;
+	return true;
+}
+
 void LLPanelPlacesTab::setPanelPlacesButtons(LLPanelPlaces* panel)
 {
 	//mShareBtn = panel->getChild<LLButton>("share_btn");
@@ -75,24 +85,3 @@ void LLPanelPlacesTab::onRegionResponse(const LLVector3d& landmark_global_pos,
 
 	LLNotifications::instance().add("CopySLURL", args);
 }
-
-void LLPanelPlacesTab::onTabSelected()
-{
-	togglePanelPlacesButtons(TRUE);
-}
-
-void LLPanelPlacesTab::togglePanelPlacesButtons(BOOL enabled)
-{
-	if (enabled)
-	{
-		//mShareBtn->setEnabled(TRUE);
-		mTeleportBtn->setEnabled(TRUE);
-		mShowOnMapBtn->setEnabled(TRUE);
-	}
-	else
-	{
-		//mShareBtn->setEnabled(FALSE);
-		mTeleportBtn->setEnabled(FALSE);
-		mShowOnMapBtn->setEnabled(FALSE);
-	}
-}