diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-21 12:57:44 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-21 12:57:44 -0500 |
| commit | 460d781332a44cbeabd1135a006838a1f197cff6 (patch) | |
| tree | e29a0ec404d2d9994a4dd5afa9ab8f9bcb1f9f04 | |
| parent | 5aaaa4e9473615c06fde9e19f34d309aa7b9fb0f (diff) | |
| parent | d894c7a0d8292ce2114e88f382dcf6187b0d2535 (diff) | |
automated merge viewer2.0->viewer2.0
| -rw-r--r-- | indra/newview/llpanelpicks.cpp | 12 | ||||
| -rw-r--r-- | indra/newview/llpanelpicks.h | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_search.xml | 4 |
3 files changed, 16 insertions, 2 deletions
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(); 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" |