livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-6650: Only check for non-friends in ad hoc conferences when user selects "only groups and friends can IM me". From MartinRJ Fayray in VWR-29148/STORM-1890.

Tonya Souther 2012-06-23 15:35:32 -05:00
parent 93536acca9
commit 0f8085320a
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/llimview.cpp
View File

@ -2611,8 +2611,20 @@ void LLIMMgr::addMessage(
make_ui_sound("UISndNewIncomingIMSession");
}
bool skip_message = (gSavedSettings.getBOOL("VoiceCallsFriendsOnly") &&
LLAvatarTracker::instance().getBuddyInfo(other_participant_id) == NULL);
//<FS:TS> FIRE-6650: Group chat for non-friends mutes when disabling voice chat from non-friends
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);
}
}
//bool skip_message = (gSavedSettings.getBOOL("VoiceCallsFriendsOnly") &&
// LLAvatarTracker::instance().getBuddyInfo(other_participant_id) == NULL);
//</FS:TS> FIRE-6650
if (!LLMuteList::getInstance()->isMuted(other_participant_id, LLMute::flagTextChat) && !skip_message)
{