Merge

1 files changed, 1 insertions, 6 deletions

diff --git a/indra/newview/llsidepanelinventorysubpanel.cpp b/indra/newview/llsidepanelinventorysubpanel.cpp
index 23931defdd..793904faa8 100644
--- a/indra/newview/llsidepanelinventorysubpanel.cpp
+++ b/indra/newview/llsidepanelinventorysubpanel.cpp
@@ -57,7 +57,6 @@ LLSidepanelInventorySubpanel::LLSidepanelInventorySubpanel()
   : LLPanel(),
 	mIsDirty(TRUE),
 	mIsEditing(FALSE),
-	mEditBtn(NULL),
 	mCancelBtn(NULL),
 	mSaveBtn(NULL)
 {
@@ -71,9 +70,6 @@ LLSidepanelInventorySubpanel::~LLSidepanelInventorySubpanel()
 // virtual
 BOOL LLSidepanelInventorySubpanel::postBuild()
 {
-	mEditBtn = getChild<LLButton>("edit_btn");
-	mEditBtn->setClickedCallback(boost::bind(&LLSidepanelInventorySubpanel::onEditButtonClicked, this));
-
 	mSaveBtn = getChild<LLButton>("save_btn");
 	mSaveBtn->setClickedCallback(boost::bind(&LLSidepanelInventorySubpanel::onSaveButtonClicked, this));
 
@@ -111,9 +107,9 @@ void LLSidepanelInventorySubpanel::draw()
 {
 	if (mIsDirty)
 	{
-		mIsDirty = FALSE;
 		refresh();
 		updateVerbs();
+		mIsDirty = FALSE;
 	}
 
 	LLPanel::draw();
@@ -127,7 +123,6 @@ void LLSidepanelInventorySubpanel::dirty()
 
 void LLSidepanelInventorySubpanel::updateVerbs()
 {
-	mEditBtn->setVisible(!mIsEditing);
 	mSaveBtn->setVisible(mIsEditing);
 	mCancelBtn->setVisible(mIsEditing);
 }