livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

speculative attempt at a 'no answer' dialog state, and some more debug spew.

meow-7.2.2
Tofu Linden 2009-11-16 17:36:07 +00:00
parent 2128df33ec
commit 5b6002f5cc
2 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
indra/newview/llvoicechannel.cpp
View File

@ -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();
}
}
}

11
indra/newview/skins/default/xui/en/floater_outgoing_call.xml
View File

@ -57,6 +57,17 @@ Connecting to [CALLEE_NAME]
width="315"
word_wrap="true">
Calling [CALLEE_NAME]
</text>
<text
font="SansSerifLarge"
height="20"
layout="topleft"
left="77"
name="noanswer"
top="27"
width="315"
word_wrap="true">
No Answer. Please try again later.
</text>
<text
font="SansSerif"