diff options
author | Oz Linden <oz@lindenlab.com> | 2013-03-13 15:15:15 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-03-13 15:15:15 -0400 |
commit | 75722baf295aff7927bff3c70cdf0ec27399cb37 (patch) | |
tree | a7a3fccc7bfebb4605c561e34ac66ad3c478368e /indra/newview/llvoicechannel.cpp | |
parent | 5c68b2456e8603322a1f12694c196246752bab53 (diff) | |
parent | d348deb7049cbaef7c228000525c7ee5a265464c (diff) |
merge changes for latest viewer-development
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 |