diff options
author | James Cook <james@lindenlab.com> | 2009-11-23 14:46:47 -0800 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2009-11-23 14:46:47 -0800 |
commit | 620de712c44e2229158d93e456d500a65d842b8d (patch) | |
tree | 42ee8997deefa0333ca8ff75da49cd4f58750371 /indra/newview/llpanelpeople.cpp | |
parent | 7bfa11ed694f9fffa9d8983f3d60f740d630cfc2 (diff) | |
parent | 070c3a1e4b52005f4671e9143169332bebe06633 (diff) |
merge, manual conflict fix panel_bottomtray.xml, talk_button.xml, llfloaternearbymedia.cpp
Diffstat (limited to 'indra/newview/llpanelpeople.cpp')
-rw-r--r-- | indra/newview/llpanelpeople.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp index 29f7cc1851..0c832defd7 100644 --- a/indra/newview/llpanelpeople.cpp +++ b/indra/newview/llpanelpeople.cpp @@ -483,7 +483,7 @@ void LLPanelPeople::onFriendsAccordionExpandedCollapsed(const LLSD& param, LLAva BOOL LLPanelPeople::postBuild() { - mVisibleSignal.connect(boost::bind(&LLPanelPeople::onVisibilityChange, this, _2)); + setVisibleCallback(boost::bind(&LLPanelPeople::onVisibilityChange, this, _2)); mFilterEditor = getChild<LLFilterEditor>("filter_input"); mFilterEditor->setCommitCallback(boost::bind(&LLPanelPeople::onFilterEdit, this, _2)); |