EXT-2216 : Task properties sidepanel

Subclassing sidepanel item/task info with llsidepanelinventorysubpanel.
Some bug fixing and cleanup.

--HG--
branch : avatar-pipeline

1 files changed, 9 insertions, 25 deletions

diff --git a/indra/newview/llsidepaneliteminfo.h b/indra/newview/llsidepaneliteminfo.h
index 9f5ab402ea..b348b5cceb 100644
--- a/indra/newview/llsidepaneliteminfo.h
+++ b/indra/newview/llsidepaneliteminfo.h
@@ -33,10 +33,7 @@
 #ifndef LL_LLSIDEPANELITEMINFO_H

 #define LL_LLSIDEPANELITEMINFO_H

 

-#include <map>

-#include "llmultifloater.h"

-#include "lliconctrl.h"

-#include "llpermissions.h"

+#include "llsidepanelinventorysubpanel.h"

 

 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 // Class LLSidepanelItemInfo

@@ -47,38 +44,34 @@ class LLButton;
 class LLInventoryItem;

 class LLItemPropertiesObserver;

 class LLViewerObject;

+class LLPermissions;

 

-class LLSidepanelItemInfo : public LLPanel

+class LLSidepanelItemInfo : public LLSidepanelInventorySubpanel

 {

 public:

 	LLSidepanelItemInfo();

 	virtual ~LLSidepanelItemInfo();

 	

 	/*virtual*/ BOOL postBuild();

-	/*virtual*/ void setVisible(BOOL visible);

-	/*virtual*/ void draw();

+	/*virtual*/ void reset();

 

 	void setObjectID(const LLUUID& object_id);

 	void setItemID(const LLUUID& item_id);

 	void setEditMode(BOOL edit);

 

-	void reset();

-	void dirty();

-

 protected:

+	/*virtual*/ void refresh();

+	/*virtual*/ void save();

+	/*virtual*/ void updateVerbs();

+

 	LLInventoryItem* findItem() const;

 	LLViewerObject*  findObject() const;

-	void refresh();

+	

 	void refreshFromItem(LLInventoryItem* item);

-	void refreshFromPermissions(const LLPermissions& perm);

-	void updateVerbs();

-	BOOL isUpdatingObject() const;

 

 private:

 	LLUUID mItemID; 	// inventory UUID for the inventory item.

 	LLUUID mObjectID; 	// in-world task UUID, or null if in agent inventory.

-	BOOL mDirty; 		// item properties need to be updated

-	BOOL mEditMode; 	// if we're in edit mode

 	LLItemPropertiesObserver* mPropertiesObserver; // for syncing changes to item

 	

 	//

@@ -93,15 +86,6 @@ protected:
 	void 						onCommitSaleInfo();

 	void 						onCommitSaleType();

 	void 						updateSaleInfo();

-

-protected:

-	void 						onEditButtonClicked();

-	void 						onSaveButtonClicked();

-	void 						onCancelButtonClicked();

-private:

-	LLButton*					mEditBtn;

-	LLButton*					mSaveBtn;

-	LLButton*					mCancelBtn;

 };

 

 #endif // LL_LLSIDEPANELITEMINFO_H