diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-12 19:36:24 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-12 19:36:24 +0000 |
| commit | 4acc05b3793623a03ea763c5c8c4072f986ee286 (patch) | |
| tree | 3b674c554ccfa9348861d773531a7ef8b04a53e4 /indra/newview/llvoiceclient.cpp | |
| parent | dd9abe71c25f1ed03771005e8ca3f7fb0aaef5b2 (diff) | |
| parent | e5a2b1c458a86006959b924986288c48689a9bd3 (diff) | |
merge latest batch of stuff from viewer2voiceparity
Diffstat (limited to 'indra/newview/llvoiceclient.cpp')
| -rw-r--r-- | indra/newview/llvoiceclient.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index 39d4bb0c02..fe24c30022 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -4273,7 +4273,7 @@ void LLVoiceClient::mediaStreamUpdatedEvent( if(incoming) { // Send the voice chat invite to the GUI layer - // TODO: Question: Should we correlate with the mute list here? + // *TODO: Question: Should we correlate with the mute list here? session->mIMSessionID = LLIMMgr::computeSessionID(IM_SESSION_P2P_INVITE, session->mCallerID); session->mVoiceInvitePending = true; if(session->mName.empty()) |