diff -r 29143d1fc6fa -r 6134af9ff32b indra/newview/llimview.cpp --- a/indra/newview/llimview.cpp Mon May 28 09:23:24 2012 -0400 +++ b/indra/newview/llimview.cpp Thu Jun 21 22:18:51 2012 +0200 @@ -2458,8 +2458,16 @@ make_ui_sound("UISndNewIncomingIMSession"); } - bool skip_message = (gSavedSettings.getBOOL("VoiceCallsFriendsOnly") && - LLAvatarTracker::instance().getBuddyInfo(other_participant_id) == NULL); + bool skip_message = false; + LLIMModel::LLIMSession* session = LLIMModel::instance().findIMSession(new_session_id); + if (session) + { + if (session->isAdHoc()) + { + skip_message = (other_participant_id != gAgentID && gSavedSettings.getBOOL("VoiceCallsFriendsOnly") && + LLAvatarTracker::instance().getBuddyInfo(other_participant_id) == NULL); + } + } if (!LLMuteList::getInstance()->isMuted(other_participant_id, LLMute::flagTextChat) && !skip_message) {