diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-16 17:36:07 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-16 17:36:07 +0000 |
| commit | 5b6002f5cc9bd209372fb7453728ec3bd4842430 (patch) | |
| tree | ebf28d8a07631d5affa82e1179b8de2d101edc31 /indra/newview/llvoicechannel.cpp | |
| parent | 2128df33ec894d1b5ac1a0e0ad7023fe483abfe3 (diff) | |
speculative attempt at a 'no answer' dialog state, and some more debug spew.
Diffstat (limited to 'indra/newview/llvoicechannel.cpp')
| -rw-r--r-- | indra/newview/llvoicechannel.cpp | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/indra/newview/llvoicechannel.cpp b/indra/newview/llvoicechannel.cpp index 871f302c3d..9e48e80ca0 100644 --- a/indra/newview/llvoicechannel.cpp +++ b/indra/newview/llvoicechannel.cpp @@ -747,6 +747,8 @@ LLVoiceChannelP2P::LLVoiceChannelP2P(const LLUUID& session_id, const std::string void LLVoiceChannelP2P::handleStatusChange(EStatusType type) { + llinfos << "CALL CHANNEL STATUS CHANGE: " << type << llendl; + // status updates switch(type) { @@ -904,6 +906,7 @@ void LLVoiceChannelP2P::setState(EState state) ocd->getChild<LLTextBox>("calling")->setVisible(true); ocd->getChild<LLTextBox>("leaving")->setVisible(true); ocd->getChild<LLTextBox>("connecting")->setVisible(false); + ocd->getChild<LLTextBox>("noanswer")->setVisible(false); } } } @@ -915,16 +918,29 @@ void LLVoiceChannelP2P::setState(EState state) ocd->getChild<LLTextBox>("calling")->setVisible(false); ocd->getChild<LLTextBox>("leaving")->setVisible(false); ocd->getChild<LLTextBox>("connecting")->setVisible(true); + ocd->getChild<LLTextBox>("noanswer")->setVisible(false); } }*/ + else if (state == STATE_ERROR) + { + LLOutgoingCallDialog *ocd = dynamic_cast<LLOutgoingCallDialog*>(LLFloaterReg::showInstance("outgoing_call", mCallDialogPayload, TRUE)); + if (ocd) + { + ocd->getChild<LLTextBox>("calling")->setVisible(false); + ocd->getChild<LLTextBox>("leaving")->setVisible(false); + ocd->getChild<LLTextBox>("connecting")->setVisible(false); + ocd->getChild<LLTextBox>("noanswer")->setVisible(true); + } + } else if (state == STATE_HUNG_UP || state == STATE_CONNECTED) { - LLOutgoingCallDialog *ocd = dynamic_cast<LLOutgoingCallDialog*>(LLFloaterReg::showInstance("outgoing_call", mCallDialogPayload, TRUE)); - if (ocd) - { - ocd->closeFloater(); - } + // hide popup + LLOutgoingCallDialog *ocd = dynamic_cast<LLOutgoingCallDialog*>(LLFloaterReg::showInstance("outgoing_call", mCallDialogPayload, TRUE)); + if (ocd) + { + ocd->closeFloater(); + } } } |