diff options
| author | callum <none@none> | 2009-12-15 17:53:03 -0800 |
|---|---|---|
| committer | callum <none@none> | 2009-12-15 17:53:03 -0800 |
| commit | b7747a815f1fb7ee49804b6b2daf2e347b27f7a5 (patch) | |
| tree | 7edef8c608cc99cb0e657694d259598294858851 /indra/newview/llvoicechannel.cpp | |
| parent | f923f896bca0d0d8459c35a5ef8e0d0171cbe664 (diff) | |
| parent | fc40740e1e5a7fcb1ed8bf3b4b6eaffe7d3d9c07 (diff) | |
Merge with tip before push
Diffstat (limited to 'indra/newview/llvoicechannel.cpp')
| -rw-r--r-- | indra/newview/llvoicechannel.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llvoicechannel.cpp b/indra/newview/llvoicechannel.cpp index 175b6f1d10..fd4e7bb91f 100644 --- a/indra/newview/llvoicechannel.cpp +++ b/indra/newview/llvoicechannel.cpp @@ -122,6 +122,7 @@ LLVoiceChannel::LLVoiceChannel(const LLUUID& session_id, const std::string& sess mSessionID(session_id), mState(STATE_NO_CHANNEL_INFO), mSessionName(session_name), + mCallDirection(OUTGOING_CALL), mIgnoreNextSessionLeave(FALSE) { mNotifyArgs["VOICE_CHANNEL_NAME"] = mSessionName; @@ -405,7 +406,7 @@ void LLVoiceChannel::doSetState(const EState& new_state) EState old_state = mState; mState = new_state; if (!mStateChangedCallback.empty()) - mStateChangedCallback(old_state, mState); + mStateChangedCallback(old_state, mState, mCallDirection); } //static |