diff options
author | Paul ProductEngine <pguslisty@productengine.com> | 2012-08-31 19:22:41 +0300 |
---|---|---|
committer | Paul ProductEngine <pguslisty@productengine.com> | 2012-08-31 19:22:41 +0300 |
commit | 73769180f363556d5517e3070fc4a2ac61e713d6 (patch) | |
tree | f6f0649d8b2b8344af91ff3011911a722236ebf8 /indra/newview/llvoicechannel.cpp | |
parent | c2bb1a189c5f4c2367ee38e03371b28948e3ea81 (diff) |
CHUI-298 FIXED (Conversation started as an IM and then goes to voice call does not show as call in conversation log)
- Show voice icon when call is started
- Added flag LLConversation::mIsConversationPast which means that this conversation is finished and any of its data can't be changed. I.e. it cannot be reused.
- When session removed (i.e. finished) corresponding conversation is marked as Past conversation. I.e. mIsConversationPast is true.
- Added changed(const LLUUID& session_id, U32 mask) method to LLConversationLog to notify particular conversation. This is used in LLConversationLogList to update its particular item and not to rebuild the whole list.
Diffstat (limited to 'indra/newview/llvoicechannel.cpp')
-rw-r--r-- | indra/newview/llvoicechannel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoicechannel.cpp b/indra/newview/llvoicechannel.cpp index bd12328a6b..ceff75a0cc 100644 --- a/indra/newview/llvoicechannel.cpp +++ b/indra/newview/llvoicechannel.cpp @@ -414,7 +414,7 @@ void LLVoiceChannel::doSetState(const EState& new_state) mState = new_state; if (!mStateChangedCallback.empty()) - mStateChangedCallback(old_state, mState, mCallDirection, mCallEndedByAgent); + mStateChangedCallback(old_state, mState, mCallDirection, mCallEndedByAgent, mSessionID); } //static |