merge

1 files changed, 17 insertions, 0 deletions

diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp
index 4d22d96072..751705dd57 100644
--- a/indra/newview/llpanelpicks.cpp
+++ b/indra/newview/llpanelpicks.cpp
@@ -485,6 +485,18 @@ void LLPanelPicks::onOpen(const LLSD& key)
 	LLPanelProfileTab::onOpen(key);
 }
 
+void LLPanelPicks::onClosePanel()
+{
+	if (mPanelClassifiedInfo)
+	{
+		onPanelClassifiedClose(mPanelClassifiedInfo);
+	}
+	if (mPanelPickInfo)
+	{
+		onPanelPickClose(mPanelPickInfo);
+	}
+}
+
 void LLPanelPicks::onListCommit(const LLFlatListView* f_list)
 {
 	// Make sure only one of the lists has selection.
@@ -769,6 +781,11 @@ void LLPanelPicks::onPanelPickSave(LLPanel* panel)
 
 void LLPanelPicks::onPanelClassifiedSave(LLPanelClassifiedEdit* panel)
 {
+	if(!panel->canClose())
+	{
+		return;
+	}
+
 	if(panel->isNew())
 	{
 		LLClassifiedItem* c_item = new LLClassifiedItem(getAvatarId(), panel->getClassifiedId());