From 82b0a42f86b9eb0ce45635cd91d689e9400e7824 Mon Sep 17 00:00:00 2001 From: Lynx Linden Date: Mon, 21 Dec 2009 16:45:23 +0000 Subject: DEV-44357: Close classified/pick details when closing Pick panel. When we close the Pick panel, we now also close any specific classified or pick that was opened from the pick panel. --- indra/newview/llpanelpicks.cpp | 12 ++++++++++++ indra/newview/llpanelpicks.h | 2 ++ 2 files changed, 14 insertions(+) (limited to 'indra/newview') diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp index 4d22d96072..69fa110d11 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. diff --git a/indra/newview/llpanelpicks.h b/indra/newview/llpanelpicks.h index fd8a9e6938..1b2e35ca46 100644 --- a/indra/newview/llpanelpicks.h +++ b/indra/newview/llpanelpicks.h @@ -74,6 +74,8 @@ public: /*virtual*/ void onOpen(const LLSD& key); + /*virtual*/ void onClosePanel(); + void processProperties(void* data, EAvatarProcessorType type); void updateData(); -- cgit v1.2.3