Enabling "Only friends and groups can call or IM me" mutes your own chat in all groups and mutes all group chat from non friends
Review Request #586 - Created June 21, 2012 and submitted
| MartinRJ Fayray | Reviewers | ||
| 3.3.2 | viewer | ||
| STORM-1890 | |||
| None | viewer-release | ||
Repository: https://bitbucket.org/MartinRJ/storm-1890
See Jira for details: https://jira.secondlife.com/browse/STORM-1890
Expand changes
Hide Extra Whitespace| indra/newview/llimview.cpp | |||
|---|---|---|---|
| Revision 29143d1fc6fa | New Change | ||
| ... | 2450 lines hidden [Expand] | ||
void LLIMMgr::addMessage( |
|||
| 2451 |
if(!gIMMgr->leaveSession(new_session_id)) |
2451 |
if(!gIMMgr->leaveSession(new_session_id)) |
| 2452 |
{ |
2452 |
{ |
| 2453 |
llinfos << "Session " << new_session_id << " does not exist." << llendl; |
2453 |
llinfos << "Session " << new_session_id << " does not exist." << llendl; |
| 2454 |
} |
2454 |
} |
| 2455 |
return; |
2455 |
return; |
| 2456 |
} |
2456 |
} |
| 2457 | 2457 | ||
| 2458 |
make_ui_sound("UISndNewIncomingIMSession"); |
2458 |
make_ui_sound("UISndNewIncomingIMSession"); |
| 2459 |
} |
2459 |
} |
| 2460 | 2460 | ||
| 2461 | bool skip_message = (gSavedSettings.getBOOL("VoiceCallsFriendsOnly") && |
2461 | bool skip_message = false; |
| 2462 |
LLIMModel::LLIMSession* session = LLIMModel::instance().findIMSession(new_session_id); |
||
| 2463 |
if (session) |
||
| 2464 |
{ |
||
| 2465 |
if (session->isAdHoc()) |
||
| 2466 |
{ |
||
| 2467 |
skip_message = (other_participant_id != gAgentID && gSavedSettings.getBOOL("VoiceCallsFriendsOnly") && |
||
| 2462 |
LLAvatarTracker::instance().getBuddyInfo(other_participant_id) == NULL); |
2468 |
LLAvatarTracker::instance().getBuddyInfo(other_participant_id) == NULL); |
| 2469 |
} |
||
| 2470 |
} |
||
| 2463 | 2471 | ||
| 2464 |
if (!LLMuteList::getInstance()->isMuted(other_participant_id, LLMute::flagTextChat) && !skip_message) |
2472 |
if (!LLMuteList::getInstance()->isMuted(other_participant_id, LLMute::flagTextChat) && !skip_message) |
| 2465 |
{ |
2473 |
{ |
| 2466 |
LLIMModel::instance().addMessage(new_session_id, from, other_participant_id, msg); |
2474 |
LLIMModel::instance().addMessage(new_session_id, from, other_participant_id, msg); |
| 2467 |
} |
2475 |
} |
| 2468 |
}
|
2476 |
}
|
| 2469 | 2477 | ||
| 2470 |
void LLIMMgr::addSystemMessage(const LLUUID& session_id, const std::string& message_name, const LLSD& args) |
2478 |
void LLIMMgr::addSystemMessage(const LLUUID& session_id, const std::string& message_name, const LLSD& args) |
| 2471 |
{
|
2479 |
{
|
| 2472 |
LLUIString message; |
2480 |
LLUIString message; |
| ... | 899 lines hidden [Expand] | ||
Other reviews