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 From d894c7a0d8292ce2114e88f382dcf6187b0d2535 Mon Sep 17 00:00:00 2001 From: Lynx Linden Date: Mon, 21 Dec 2009 16:55:41 +0000 Subject: DEV-43799: Increase the minimum floater size for Search. Liana and the search team want the minimum size of the search floater to be such that the web content appears at 650x600 pixels. Users can resize the window larger, but not smaller, than this limit. --- indra/newview/skins/default/xui/en/floater_search.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml index 9c1a5499db..5a9e2ebe6e 100644 --- a/indra/newview/skins/default/xui/en/floater_search.xml +++ b/indra/newview/skins/default/xui/en/floater_search.xml @@ -4,8 +4,8 @@ can_resize="true" height="646" layout="topleft" - min_height="140" - min_width="467" + min_height="646" + min_width="670" name="floater_search" help_topic="floater_search" save_rect="true" -- cgit v1.2.3