diff options
| author | Jonathan Yap <none@none> | 2011-10-26 14:06:08 -0400 | 
|---|---|---|
| committer | Jonathan Yap <none@none> | 2011-10-26 14:06:08 -0400 | 
| commit | f73fddd5d0c5a398a592dcc058b1feb09964560d (patch) | |
| tree | 2e4f5d6390bcfb447d93fa590f5ccac8a3521ef2 /indra/newview | |
| parent | db643d1881196c01687b06130f26452cd2e04bac (diff) | |
STORM-1653 Group notices sent by muted residents are still displayed
Added warning message if a null is returned from the name to id call.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 11 | 
1 files changed, 7 insertions, 4 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index fe613b3dc9..05303cf3c5 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2451,13 +2451,16 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)  				break;  			} -			// The group notice packet does not have an AgentID.  Try to obtain one from the name cache. -			// If there is a cache miss and a background fetch has to occur the group notice may -			// be displayed even though the resident has been muted. +			// The group notice packet does not have an AgentID.  Obtain one from the name cache.  			std::string legacy_name = gCacheName->buildLegacyName(original_name);  			LLUUID agent_id;  			gCacheName->getUUID(legacy_name, agent_id); -			if (agent_id.notNull() && LLMuteList::getInstance()->isMuted(agent_id)) + +			if (agent_id.isNull()) +			{ +				LL_WARNS("Messaging") << "buildLegacyName returned null" << LL_ENDL;			 +			} +			else if (LLMuteList::getInstance()->isMuted(agent_id))  			{  				break;  			}  | 
