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

merge changes for storm-1795

master
Oz Linden 2012-02-09 11:53:14 -05:00
parent c2e39e9230 9003c4c54b
commit e836d90ebb
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -612,6 +612,7 @@ Jonathan Yap
STORM-1741
STORM-1790
STORM-1788
STORM-1795
STORM-1799
STORM-1796
Kadah Coba

5
indra/newview/llimview.cpp
View File

@ -2458,7 +2458,10 @@ void LLIMMgr::addMessage(
make_ui_sound("UISndNewIncomingIMSession");
}
if (!LLMuteList::getInstance()->isMuted(other_participant_id, LLMute::flagTextChat))
bool skip_message = (gSavedSettings.getBOOL("VoiceCallsFriendsOnly") &&
LLAvatarTracker::instance().getBuddyInfo(other_participant_id) == NULL);
if (!LLMuteList::getInstance()->isMuted(other_participant_id, LLMute::flagTextChat) && !skip_message)
{
LLIMModel::instance().addMessage(new_session_id, from, other_participant_id, msg);
}