Merge recent changes

1 files changed, 3 insertions, 5 deletions

diff --git a/indra/newview/llpanelplacestab.h b/indra/newview/llpanelplacestab.h
index 5d6b7d1090..1c70869414 100644
--- a/indra/newview/llpanelplacestab.h
+++ b/indra/newview/llpanelplacestab.h
@@ -43,23 +43,21 @@ public:
 	virtual ~LLPanelPlacesTab() {}
 
 	virtual void onSearchEdit(const std::string& string) = 0;
+	virtual void updateVerbs() = 0;		// Updates buttons at the bottom of Places panel
 	//virtual void onShare() = 0;
 	virtual void onShowOnMap() = 0;
 	virtual void onTeleport() = 0;
 	//virtual void onCopySLURL() = 0;
 
+	bool isTabVisible(); // Check if parent TabContainer is visible.
+
 	void setPanelPlacesButtons(LLPanelPlaces* panel);
 	void onRegionResponse(const LLVector3d& landmark_global_pos,
 										U64 region_handle,
 										const std::string& url,
 										const LLUUID& snapshot_id,
 										bool teleport);
-	void onTabSelected();
-
 protected:
-	void togglePanelPlacesButtons(BOOL enabled);
-
-private:
 	//LLButton*				mShareBtn;
 	LLButton*				mTeleportBtn;
 	LLButton*				mShowOnMapBtn;