diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-09-11 23:56:28 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-09-11 23:56:28 +0000 |
| commit | 245172949fa6b4ee4fde7da66f7abb804503ed9a (patch) | |
| tree | b626db2b79442ca815949c7b40c51192954b1f30 /indra/newview/lltoastimpanel.cpp | |
| parent | 7df79382a075646a51f21bed0d7f8de883fc3608 (diff) | |
merge -r 1649-1651 https://svn.aws.productengine.com/secondlife/pe/stable-2@1648 -> viewer-2.0.0-3
Fixes: EXT-843 EXT-846
New Dev: EXT-514
Diffstat (limited to 'indra/newview/lltoastimpanel.cpp')
| -rw-r--r-- | indra/newview/lltoastimpanel.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/indra/newview/lltoastimpanel.cpp b/indra/newview/lltoastimpanel.cpp index 15d54d8b3b..d401943020 100644 --- a/indra/newview/lltoastimpanel.cpp +++ b/indra/newview/lltoastimpanel.cpp @@ -57,7 +57,19 @@ LLToastIMPanel::LLToastIMPanel(LLToastIMPanel::Params &p) : LLToastPanel(p.notif mSessionID = p.session_id; mNotification = p.notification; - mReplyBtn->setClickedCallback(boost::bind(&LLToastIMPanel::onClickReplyBtn, this)); + // if message comes from the system - there shouldn't be a reply btn + if(p.from == "Second Life") + { + mReplyBtn->setVisible(FALSE); + S32 btn_height = mReplyBtn->getRect().getHeight(); + LLRect msg_rect = mMessage->getRect(); + msg_rect.setLeftTopAndSize(msg_rect.mLeft, msg_rect.mTop, msg_rect.getWidth(), msg_rect.getHeight() + btn_height); + mMessage->setRect(msg_rect); + } + else + { + mReplyBtn->setClickedCallback(boost::bind(&LLToastIMPanel::onClickReplyBtn, this)); + } S32 maxLinesCount; std::istringstream ss( getString("message_max_lines_count") ); |