diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-25 09:35:17 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-25 09:35:17 -0400 |
| commit | 012a0953b56d8313c6c0f71444f115de1aeeb7e1 (patch) | |
| tree | 59fece92dfa8895d852e997b884ace46b9e1b3a9 /indra/newview/llviewermessage.cpp | |
| parent | 7c08ddb3f748d2173948335fd799879e3d58d81c (diff) | |
| parent | b7a349f231977d5917b29faacca143a85d925576 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llviewermessage.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 369d2d757d..65b569a190 100644..100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -1807,8 +1807,11 @@ void LLOfferInfo::initRespondFunctionMap() void inventory_offer_handler(LLOfferInfo* info) { - //If muted, don't even go through the messaging stuff. Just curtail the offer here. - if (LLMuteList::getInstance()->isMuted(info->mFromID, info->mFromName)) + // If muted, don't even go through the messaging stuff. Just curtail the offer here. + // Passing in a null UUID handles the case of where you have muted one of your own objects by_name. + // The solution for STORM-1297 seems to handle the cases where the object is owned by someone else. + if (LLMuteList::getInstance()->isMuted(info->mFromID, info->mFromName) || + LLMuteList::getInstance()->isMuted(LLUUID::null, info->mFromName)) { info->forceResponse(IOR_MUTE); return; @@ -3129,7 +3132,7 @@ protected: void handleFailure() { - LLTranslate::TranslationReceiver::handleFailure(); + llwarns << "translation failed for mesg " << m_origMesg << " toLang " << m_toLang << " fromLang " << m_fromLang << llendl; m_chat.mText += " (?)"; LLNotificationsUI::LLNotificationManager::instance().onChat(m_chat, m_toastArgs); |