summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelme.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2011-10-14 16:49:11 -0700
committerMerov Linden <merov@lindenlab.com>2011-10-14 16:49:11 -0700
commitfc2bd1cce2e6c213fa682b9768d435a4e394a95e (patch)
treedba1adbac8c96a093a0dfd5f54b7eccd65bf2233 /indra/newview/llpanelme.cpp
parent4c6f04c50225a4a5494974c3a6e13bee76cfbb6f (diff)
parentcf98cdf69f481dd473363d4a80a80f27e96f87e8 (diff)
Pull from richard/viewer-experience-fui
Diffstat (limited to 'indra/newview/llpanelme.cpp')
-rw-r--r--indra/newview/llpanelme.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/indra/newview/llpanelme.cpp b/indra/newview/llpanelme.cpp
index 0b687009bf..7e47a96f44 100644
--- a/indra/newview/llpanelme.cpp
+++ b/indra/newview/llpanelme.cpp
@@ -84,7 +84,7 @@ void LLPanelMe::buildEditPanel()
// All profile editing should go through the web.
//mEditPanel->childSetAction("save_btn", boost::bind(&LLPanelMe::onSaveChangesClicked, this), this);
- mEditPanel->childSetAction("cancel_btn", boost::bind(&LLPanelMe::onCancelClicked, this), this);
+ //mEditPanel->childSetAction("cancel_btn", boost::bind(&LLPanelMe::onCancelClicked, this), this);
}
}
@@ -92,12 +92,6 @@ void LLPanelMe::buildEditPanel()
void LLPanelMe::onEditProfileClicked()
{
buildEditPanel();
- togglePanel(mEditPanel, getAvatarId()); // open
-}
-
-void LLPanelMe::onCancelClicked()
-{
- togglePanel(mEditPanel); // close
}
//////////////////////////////////////////////////////////////////////////