diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-03-25 12:00:00 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-03-25 12:00:00 -0700 |
| commit | 54bba824228162724a1d46d9c7900e9aa7a077a3 (patch) | |
| tree | 3355699f63f141e5fc0546dfe279b8aa65d40e07 /indra/newview/lltoastnotifypanel.cpp | |
| parent | f813a25224081e68d4772676909d2cff14407486 (diff) | |
| parent | 78eada5b6c3a8d20a2ea49887ab7c091e4b6fa14 (diff) | |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/lltoastnotifypanel.cpp')
| -rwxr-xr-x | indra/newview/lltoastnotifypanel.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/lltoastnotifypanel.cpp b/indra/newview/lltoastnotifypanel.cpp index 3a41bf28b4..9824f2dd38 100755 --- a/indra/newview/lltoastnotifypanel.cpp +++ b/indra/newview/lltoastnotifypanel.cpp @@ -41,6 +41,7 @@ #include "llnotificationsutil.h" #include "llviewermessage.h" #include "llfloaterimsession.h" +#include "llavataractions.h" const S32 BOTTOM_PAD = VPAD * 3; const S32 IGNORE_BTN_TOP_DELTA = 3*VPAD;//additional ignore_btn padding @@ -130,6 +131,7 @@ LLToastNotifyPanel::~LLToastNotifyPanel() mButtonClickConnection.disconnect(); std::for_each(mBtnCallbackData.begin(), mBtnCallbackData.end(), DeletePointer()); + mBtnCallbackData.clear(); if (mIsTip) { LLNotifications::getInstance()->cancel(mNotification); @@ -313,6 +315,7 @@ void LLToastNotifyPanel::init( LLRect rect, bool show_images ) mTextBox->setVisible(TRUE); mTextBox->setPlainText(!show_images); mTextBox->setValue(mNotification->getMessage()); + mTextBox->setIsFriendCallback(LLAvatarActions::isFriend); // add buttons for a script notification if (mIsTip) |