Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
CharleyLevenque
2010-09-19 12:14:25 -04:00
parent 14a251488b 615b4896d1
commit 5dc8a19911
5 changed files with 170 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llviewermessage.cpp
View File

@@ -1479,10 +1479,9 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
LLUUID computed_session_id = LLIMMgr::computeSessionID(dialog,from_id);
// <edit>
//chat.mMuted = is_muted && !is_linden;
chat.mMuted = is_muted;
// </edit>
LLUUID computed_session_id = LLIMMgr::computeSessionID(dialog,from_id);
chat.mMuted = is_muted && !is_linden;
chat.mFromID = from_id;
chat.mFromName = name;
chat.mSourceType = (from_id.isNull() || (name == std::string(SYSTEM_FROM))) ? CHAT_SOURCE_SYSTEM : CHAT_SOURCE_AGENT;