diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2009-12-10 18:39:06 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2009-12-10 18:39:06 +0200 |
| commit | 5c1cea1e76364c3ffeb6c68229bf624b7b29ca6d (patch) | |
| tree | 26490eccf1d8fe2546500fd6bfa7e5db17691709 /indra/newview/lltoastimpanel.cpp | |
| parent | a7e9fcc132e4779ddbe8f8b5a82a4320c55b5e20 (diff) | |
implemented EXT-3341 “URLs should be clickable in the IM toasts”,
replaced mouseDown callback with handleMouseDown method to provide possibility
to separate mouse down event on panel and in panel children;
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/lltoastimpanel.cpp')
| -rw-r--r-- | indra/newview/lltoastimpanel.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
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; +} |
