From 5c1cea1e76364c3ffeb6c68229bf624b7b29ca6d Mon Sep 17 00:00:00 2001 From: Alexei Arabadji Date: Thu, 10 Dec 2009 18:39:06 +0200 Subject: =?UTF-8?q?implemented=20EXT-3341=20=E2=80=9CURLs=20should=20be=20?= =?UTF-8?q?clickable=20in=20the=20IM=20toasts=E2=80=9D,=20replaced=20mouse?= =?UTF-8?q?Down=20callback=20with=20handleMouseDown=20method=20to=20provid?= =?UTF-8?q?e=20possibility=20to=20separate=20mouse=20down=20event=20on=20p?= =?UTF-8?q?anel=20and=20in=20panel=20children;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --HG-- branch : product-engine --- indra/newview/lltoastimpanel.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'indra/newview/lltoastimpanel.cpp') diff --git a/indra/newview/lltoastimpanel.cpp b/indra/newview/lltoastimpanel.cpp index 7beba59c83..ed9e2e8818 100644 --- a/indra/newview/lltoastimpanel.cpp +++ b/indra/newview/lltoastimpanel.cpp @@ -85,7 +85,6 @@ LLToastIMPanel::LLToastIMPanel(LLToastIMPanel::Params &p) : LLToastPanel(p.notif sys_msg_icon->setVisible(FALSE); mAvatar->setValue(p.avatar_id); - setMouseDownCallback(boost::bind(&LLToastIMPanel::onClickToastIM, this)); } S32 maxLinesCount; @@ -102,11 +101,13 @@ LLToastIMPanel::~LLToastIMPanel() { } -//-------------------------------------------------------------------------- -void LLToastIMPanel::onClickToastIM() +//virtual +BOOL LLToastIMPanel::handleMouseDown(S32 x, S32 y, MASK mask) { - mNotification->respond(mNotification->getResponseTemplate()); -} - -//-------------------------------------------------------------------------- + if (LLPanel::handleMouseDown(x,y,mask) == FALSE) + { + mNotification->respond(mNotification->getResponseTemplate()); + } + return TRUE; +} -- cgit v1.2.3