Merge branch 'master' of github.com:Beeks/Ascent

2010-09-19 16:13:03 -04:00
parent 1c4148a9de 7c60cb04c3
commit 3d3ac50d4e
1 changed files with 1 additions and 1 deletions
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -1476,7 +1476,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 	BOOL is_muted = LLMuteList::getInstance()->isMuted(from_id, name, LLMute::flagTextChat);
 	BOOL is_linden = LLMuteList::getInstance()->isLinden(name);
 	BOOL is_owned_by_me = FALSE;
-	
+
 	LLUUID computed_session_id = LLIMMgr::computeSessionID(dialog,from_id);

 	chat.mMuted = is_muted && !is_linden;