diff options
author | Oz Linden <oz@lindenlab.com> | 2013-03-08 10:10:59 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-03-08 10:10:59 -0500 |
commit | a7f02a3e51f07c657a0acd31637f46f74b30daf7 (patch) | |
tree | c572c162ee7bec027971ca7a64f74032938b20a8 /indra/newview/llvoicechannel.cpp | |
parent | cce59647a99648af63c96168c36e85563da40a1a (diff) | |
parent | 55b2383f51ffabf7e95595df5d576f383d458ee1 (diff) |
merge changes for 3.5.0-beta2
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 |