From 59f61e2ff2f6cedb480d691f130a8d5e6b16c302 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 22 Feb 2021 21:34:17 +0200
Subject: SL-14842 Apply toolstrip layout to Places floater Part #1

Menus
---
 indra/newview/llpanelplaces.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'indra/newview/llpanelplaces.h')

diff --git a/indra/newview/llpanelplaces.h b/indra/newview/llpanelplaces.h
index 978b030b2e..610ee283c8 100644
--- a/indra/newview/llpanelplaces.h
+++ b/indra/newview/llpanelplaces.h
@@ -97,6 +97,12 @@ private:
 	void onCreateLandmarkButtonClicked(const LLUUID& folder_id);
 	void onBackButtonClicked();
 	void onProfileButtonClicked();
+    void onGearMenuClick();
+    void onSortingMenuClick();
+    void onAddMenuClick();
+    void onRemoveButtonClicked();
+    bool handleDragAndDropToTrash(BOOL drop, EDragAndDropType cargo_type, void* cargo_data, EAcceptance* accept);
+
 
 	void toggleMediaPanel();
 	void togglePickPanel(BOOL visible);
@@ -127,6 +133,12 @@ private:
 	LLMenuButton*				mOverflowBtn;
 	LLButton*					mPlaceInfoBtn;
 
+    // Top menu
+    LLMenuButton*				mGearMenuButton;
+    LLMenuButton*				mSortingMenuButton;
+    LLMenuButton*				mAddMenuButton;
+    LLButton*					mRemoveSelectedBtn;
+
 	LLPlacesInventoryObserver*	mInventoryObserver;
 	LLPlacesParcelObserver*		mParcelObserver;
 	LLRemoteParcelInfoObserver* mRemoteParcelObserver;
-- 
cgit v1.2.3


From 02036560a68fc2da6f463320b9572714cbe22916 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 24 Feb 2021 22:32:42 +0200
Subject: SL-14842 Apply toolstrip layout to Places floater Part #2

Hide buttons
---
 indra/newview/llpanelplaces.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/newview/llpanelplaces.h')

diff --git a/indra/newview/llpanelplaces.h b/indra/newview/llpanelplaces.h
index 610ee283c8..576a0fb931 100644
--- a/indra/newview/llpanelplaces.h
+++ b/indra/newview/llpanelplaces.h
@@ -48,6 +48,7 @@ class LLRemoteParcelInfoObserver;
 class LLTabContainer;
 class LLToggleableMenu;
 class LLMenuButton;
+class LLLayoutStack;
 
 typedef std::pair<LLUUID, std::string>	folder_pair_t;
 
@@ -117,6 +118,8 @@ private:
 	LLFilterEditor*				mFilterEditor;
 	LLPanelPlacesTab*			mActivePanel;
 	LLTabContainer*				mTabContainer;
+	LLPanel*					mButtonsContainer;
+	LLLayoutStack*				mFilterContainer;
 	LLPanelPlaceProfile*		mPlaceProfile;
 	LLPanelLandmarkInfo*		mLandmarkInfo;
 
-- 
cgit v1.2.3


From 554ccd718131d469a7cde1e188d9ef0f712a6ed9 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 24 Feb 2021 22:41:42 +0200
Subject: SL-14842 Apply toolstrip layout to Places floater Part #3

Removed unused buttons, moved some UI elements to be more in line with each other
---
 indra/newview/llpanelplaces.h | 2 --
 1 file changed, 2 deletions(-)

(limited to 'indra/newview/llpanelplaces.h')

diff --git a/indra/newview/llpanelplaces.h b/indra/newview/llpanelplaces.h
index 576a0fb931..3b87eb6cb9 100644
--- a/indra/newview/llpanelplaces.h
+++ b/indra/newview/llpanelplaces.h
@@ -97,7 +97,6 @@ private:
 	bool onOverflowMenuItemEnable(const LLSD& param);
 	void onCreateLandmarkButtonClicked(const LLUUID& folder_id);
 	void onBackButtonClicked();
-	void onProfileButtonClicked();
     void onGearMenuClick();
     void onSortingMenuClick();
     void onAddMenuClick();
@@ -134,7 +133,6 @@ private:
 	LLButton*					mCancelBtn;
 	LLButton*					mCloseBtn;
 	LLMenuButton*				mOverflowBtn;
-	LLButton*					mPlaceInfoBtn;
 
     // Top menu
     LLMenuButton*				mGearMenuButton;
-- 
cgit v1.2.3