From 5cfd34df908572045fe3ff193e2f9242b9f2025b Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Tue, 11 Oct 2011 18:18:02 -0400 Subject: STORM-976 Object muted by name still displays notification message when clicked --- indra/newview/llviewermessage.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'indra/newview/llviewermessage.cpp') diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 74ee918bfe..8f3163c0cf 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -1809,8 +1809,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; -- cgit v1.2.3 From e32227e90b8911200bfd103ff466ddb9231c6619 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 21 Oct 2011 13:49:35 -0400 Subject: SH-2557 WIP - some cleanup, added error message to try to isolate causes of translation failure --- indra/newview/llviewermessage.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 indra/newview/llviewermessage.cpp (limited to 'indra/newview/llviewermessage.cpp') diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp old mode 100644 new mode 100755 index 369d2d757d..04b901ed0e --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -3129,7 +3129,7 @@ protected: void handleFailure() { - LLTranslate::TranslationReceiver::handleFailure(); + llwarns << "translation failed for mesg " << m_origMesg << llendl; m_chat.mText += " (?)"; LLNotificationsUI::LLNotificationManager::instance().onChat(m_chat, m_toastArgs); -- cgit v1.2.3 From cc719670d9ae9c2793f291dd4a3fd9f0118b5876 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 21 Oct 2011 17:54:34 -0400 Subject: SH-2557 WIP - more warning message details --- indra/newview/llviewermessage.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llviewermessage.cpp') diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 04b901ed0e..3eed7edafa 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -3129,7 +3129,7 @@ protected: void handleFailure() { - llwarns << "translation failed for mesg " << m_origMesg << llendl; + 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); -- cgit v1.2.3