EXT-2216 : Task properties sidepanel

EXT-2224 : Edit item then delete item -- edit panel still active
EXT-2228 : Buy/Pay/Open buttons for Task sidepanel

--HG--
branch : avatar-pipeline

1 files changed, 23 insertions, 21 deletions

diff --git a/indra/newview/llsidepaneltaskinfo.h b/indra/newview/llsidepaneltaskinfo.h
index aea65c1170..25a9e2d577 100644
--- a/indra/newview/llsidepaneltaskinfo.h
+++ b/indra/newview/llsidepaneltaskinfo.h
@@ -35,6 +35,7 @@
 
 #include "llsidepanelinventorysubpanel.h"
 #include "lluuid.h"
+#include "llselectmgr.h"
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Class LLSidepanelTaskInfo
@@ -43,6 +44,7 @@
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 class LLNameBox;
+class LLCheckBoxCtrl;
 
 class LLSidepanelTaskInfo : public LLSidepanelInventorySubpanel
 {
@@ -52,6 +54,8 @@ public:
 
 	/*virtual*/	BOOL postBuild();
 
+	void setObjectSelection(LLObjectSelectionHandle selection);
+
 protected:
 	/*virtual*/ void refresh();	// refresh all labels as needed
 	/*virtual*/ void save();
@@ -62,29 +66,25 @@ protected:
 	static void onClickRelease(void*);
 		   void onClickGroup();
 		   void cbGroupID(LLUUID group_id);
-	static void onClickDeedToGroup(void*);
-
-	static void onCommitPerm(LLUICtrl *ctrl, void *data, U8 field, U32 perm);
-
-	static void onCommitGroupShare(LLUICtrl *ctrl, void *data);
 
-	static void onCommitEveryoneMove(LLUICtrl *ctrl, void *data);
-	static void onCommitEveryoneCopy(LLUICtrl *ctrl, void *data);
+	void onClickDeedToGroup();
+	void onCommitPerm(LLCheckBoxCtrl* ctrl, U8 field, U32 perm);
+	void onCommitGroupShare();
+	void onCommitEveryoneMove();
+	void onCommitEveryoneCopy();
+	void onCommitNextOwnerModify();
+	void onCommitNextOwnerCopy();
+	void onCommitNextOwnerTransfer();
+	void onCommitName();
+	void onCommitDesc();
+	void onCommitSaleInfo();
+	void onCommitSaleType();
+
+	void onCommitClickAction(U8 click_action);
+	void onCommitIncludeInSearch();
 
-	static void onCommitNextOwnerModify(LLUICtrl* ctrl, void* data);
-	static void onCommitNextOwnerCopy(LLUICtrl* ctrl, void* data);
-	static void onCommitNextOwnerTransfer(LLUICtrl* ctrl, void* data);
-	
-	static void onCommitName(LLUICtrl* ctrl, void* data);
-	static void onCommitDesc(LLUICtrl* ctrl, void* data);
-
-	static void onCommitSaleInfo(LLUICtrl* ctrl, void* data);
-	static void onCommitSaleType(LLUICtrl* ctrl, void* data);
 	void setAllSaleInfo();
 
-	static void	onCommitClickAction(LLUICtrl* ctrl, void*);
-	static void onCommitIncludeInSearch(LLUICtrl* ctrl, void*);
-
 private:
 	LLNameBox*		mLabelGroupName;		// group name
 
@@ -94,12 +94,14 @@ private:
 
 protected:
 	void 						onOpenButtonClicked();
-	void 						onBuildButtonClicked();
+	void 						onPayButtonClicked();
 	void 						onBuyButtonClicked();
 private:
 	LLButton*					mOpenBtn;
-	LLButton*					mBuildBtn;
+	LLButton*					mPayBtn;
 	LLButton*					mBuyBtn;
+
+	LLObjectSelectionHandle mObjectSelection;
 };