From faafa7405f2fe70996c1554605b55679c28fd10b Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Thu, 13 Aug 2009 04:40:19 +0000 Subject: merge -r 130196-130356 skinning-20 -> viewer-2.0.0-3 * EXT-449 EXT-131 EXT-464 * People and Places panel layout changes * Some I18N fixes, test language * Updated group panels following proposed new design * made ims easier to read by color coding --- indra/newview/llpanelimcontrolpanel.cpp | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) (limited to 'indra/newview/llpanelimcontrolpanel.cpp') diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp index 45fe625a13..d34ca88fc6 100644 --- a/indra/newview/llpanelimcontrolpanel.cpp +++ b/indra/newview/llpanelimcontrolpanel.cpp @@ -37,11 +37,9 @@ #include "llavataractions.h" #include "llavatariconctrl.h" #include "llbutton.h" - -static LLRegisterPanelClassWrapper t_im_control_panel("panel_im_control_panel"); +#include "llfloatergroupinfo.h" LLPanelIMControlPanel::LLPanelIMControlPanel() -: LLPanel() { } @@ -81,7 +79,34 @@ void LLPanelIMControlPanel::onShareButtonClicked() // *TODO: Implement } -void LLPanelIMControlPanel::setAvatarId(const LLUUID& avatar_id) +void LLPanelIMControlPanel::setID(const LLUUID& avatar_id) { getChild("avatar_icon")->setValue(avatar_id); } + + + +BOOL LLPanelGroupControlPanel::postBuild() +{ + childSetAction("group_info_btn", boost::bind(&LLPanelGroupControlPanel::onGroupInfoButtonClicked, this)); + childSetAction("call_btn", boost::bind(&LLPanelGroupControlPanel::onCallButtonClicked, this)); + + return TRUE; +} + +void LLPanelGroupControlPanel::onGroupInfoButtonClicked() +{ + LLFloaterGroupInfo::showFromUUID(mGroupID); +} + + +void LLPanelGroupControlPanel::onCallButtonClicked() +{ + // *TODO: Implement +} + + +void LLPanelGroupControlPanel::setID(const LLUUID& id) +{ + mGroupID = id; +} -- cgit v1.3