diff options
| author | James Cook <james@lindenlab.com> | 2009-12-11 10:22:50 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-11 10:22:50 -0800 |
| commit | a87b99cd950de20dc55e1ae6ce7186863a554326 (patch) | |
| tree | 43d1385397cbefac07934588824a3d0716fc6365 /indra/newview/lltoastimpanel.cpp | |
| parent | b26694f2ab4d88fb8a0e4b1f0e8733f111af4522 (diff) | |
| parent | c74d5c483cbd75c5e2a0b17c8980755a9932c53a (diff) | |
Merge, fixed conflict in panel_preferences_sound.xml
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; +} |