summaryrefslogtreecommitdiff
path: root/indra/newview/llvoicechannel.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2009-11-12 11:57:28 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2009-11-12 11:57:28 +0000
commit3888fed3f6da192dc714a584f976d542f1cf593c (patch)
treed9798806fc869a81983356ac181f8fd51705b8df /indra/newview/llvoicechannel.cpp
parent6524295bf06f58fad84dc7251f6ba3fd81ce94f2 (diff)
parentb38388d131271de714a16764db7e9dc4f0751672 (diff)
merge.
Diffstat (limited to 'indra/newview/llvoicechannel.cpp')
-rw-r--r--indra/newview/llvoicechannel.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llvoicechannel.cpp b/indra/newview/llvoicechannel.cpp
index 89649407ff..b0ea07946c 100644
--- a/indra/newview/llvoicechannel.cpp
+++ b/indra/newview/llvoicechannel.cpp
@@ -378,9 +378,18 @@ void LLVoiceChannel::setURI(std::string uri)
void LLVoiceChannel::setState(EState state)
{
+ LLSD payload;
+ payload["session_id"] = mSessionID;
+ payload["session_name"] = mSessionName;
+
switch(state)
{
case STATE_RINGING:
+ llinfos << "RINGINGGGGGGGG " << mSessionName << llendl;
+ if (!mSessionName.empty())
+ {
+ LLFloaterReg::showInstance("outgoing_call", payload, TRUE);
+ }
gIMMgr->addSystemMessage(mSessionID, "ringing", mNotifyArgs);
break;
case STATE_CONNECTED: