From 63cebc3ae05c952d538d17e392ebeb98c2e86cfb Mon Sep 17 00:00:00 2001 From: Dmitry Oleshko Date: Fri, 4 Dec 2009 15:05:42 +0200 Subject: partial implementation for the following tasks (EXT-2803) Create notifications and dialogs to negotiate P2P voice chat (shown over the Speak button) (EXT-2806) Create notification windows and dialogs to negotiate Group Voice Chat (docked to Speak button's chevron) (EXT-2802) Create notifications and dialogs to negotiate AvaLine calls (shown over Speak button) (EXT-2805) Create notifications and dialogs to negotiate Ad-Hoc calls (shown over Speak button) implemented: invitations, displaying of notifications according to the state of current voice chat session --HG-- branch : product-engine --- indra/newview/llvoicechannel.cpp | 59 ++-------------------------------------- 1 file changed, 2 insertions(+), 57 deletions(-) (limited to 'indra/newview/llvoicechannel.cpp') diff --git a/indra/newview/llvoicechannel.cpp b/indra/newview/llvoicechannel.cpp index 608060174a..175b6f1d10 100644 --- a/indra/newview/llvoicechannel.cpp +++ b/indra/newview/llvoicechannel.cpp @@ -316,6 +316,8 @@ void LLVoiceChannel::activate() } } + sCurrentVoiceChannelChangedSignal(this->mSessionID); + if (mState == STATE_NO_CHANNEL_INFO) { // responsible for setting status to active @@ -325,8 +327,6 @@ void LLVoiceChannel::activate() { setState(STATE_CALL_STARTED); } - - sCurrentVoiceChannelChangedSignal(this->mSessionID); } void LLVoiceChannel::getChannelInfo() @@ -874,61 +874,6 @@ void LLVoiceChannelP2P::setState(EState state) return; } } - else // outgoing call - { - mCallDialogPayload["session_id"] = mSessionID; - mCallDialogPayload["session_name"] = mSessionName; - mCallDialogPayload["other_user_id"] = mOtherUserID; - 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 - if (!mSessionName.empty()) - { - LLOutgoingCallDialog *ocd = dynamic_cast(LLFloaterReg::showInstance("outgoing_call", mCallDialogPayload, TRUE)); - if (ocd) - { - ocd->getChild("calling")->setVisible(true); - ocd->getChild("leaving")->setVisible(true); - ocd->getChild("connecting")->setVisible(false); - ocd->getChild("noanswer")->setVisible(false); - } - } - } - /*else if (state == STATE_CONNECTED) - { - LLOutgoingCallDialog *ocd = dynamic_cast(LLFloaterReg::showInstance("outgoing_call", mCallDialogPayload, TRUE)); - if (ocd) - { - ocd->getChild("calling")->setVisible(false); - ocd->getChild("leaving")->setVisible(false); - ocd->getChild("connecting")->setVisible(true); - ocd->getChild("noanswer")->setVisible(false); - } - }*/ - else if (state == STATE_ERROR) - { - LLOutgoingCallDialog *ocd = dynamic_cast(LLFloaterReg::showInstance("outgoing_call", mCallDialogPayload, TRUE)); - if (ocd) - { - ocd->getChild("calling")->setVisible(false); - ocd->getChild("leaving")->setVisible(false); - ocd->getChild("connecting")->setVisible(false); - ocd->getChild("noanswer")->setVisible(true); - } - } - else if (state == STATE_HUNG_UP || - state == STATE_CONNECTED) - { - // hide popup - LLOutgoingCallDialog *ocd = dynamic_cast(LLFloaterReg::showInstance("outgoing_call", mCallDialogPayload, TRUE)); - if (ocd) - { - ocd->closeFloater(); - } - } - } LLVoiceChannel::setState(state); } -- cgit v1.2.3