diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-16 17:13:02 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-16 17:13:02 +0000 |
| commit | 2128df33ec894d1b5ac1a0e0ad7023fe483abfe3 (patch) | |
| tree | b40a78a5181b8c0c9c0454369905072549d59d9e /indra/newview | |
| parent | bd42c1ae2cd6bb6e005478cc121c2b5d7a844eb4 (diff) | |
Be more generous with the voicechannel states that trigger the Calling popup.
Huh, the voicechannel state machine isn't much of a state machine.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llvoicechannel.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llvoicechannel.cpp b/indra/newview/llvoicechannel.cpp index ae32ec7d11..871f302c3d 100644 --- a/indra/newview/llvoicechannel.cpp +++ b/indra/newview/llvoicechannel.cpp @@ -873,6 +873,8 @@ void LLVoiceChannelP2P::setState(EState state) // *HACK: Open/close the call window if needed. toggleCallWindowIfNeeded(state); + llinfos << "CALL STATE CHANGE: incoming=" << int(mReceivedCall) << " oldstate=" << mState << " newstate=" << state << llendl; + if (mReceivedCall) // incoming call { // you only "answer" voice invites in p2p mode @@ -889,7 +891,8 @@ void LLVoiceChannelP2P::setState(EState state) mCallDialogPayload["session_id"] = mSessionID; mCallDialogPayload["session_name"] = mSessionName; mCallDialogPayload["other_user_id"] = mOtherUserID; - if (state == STATE_RINGING) + if (state == STATE_RINGING || + state == STATE_CALL_STARTED) { // *HACK: open outgoing call floater if needed, might be better done elsewhere. // *TODO: should move this squirrelly ui-fudging crap into LLOutgoingCallDialog itself |