summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Borovkov <iborovkov@productengine.com>2009-12-18 17:21:14 +0200
committerIgor Borovkov <iborovkov@productengine.com>2009-12-18 17:21:14 +0200
commit715b2758caf303c8db86bcca7945172ccdf6f8f7 (patch)
treeeb9a6bf94597b52c14573040f2900ff944b73aad
parent78d48def6ba2e7c80f1da8949079a94d2d7374af (diff)
reverted current voice channel changes notification time
--HG-- branch : product-engine
-rw-r--r--indra/newview/llvoicechannel.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llvoicechannel.cpp b/indra/newview/llvoicechannel.cpp
index 60a2c3b638..69d2458217 100644
--- a/indra/newview/llvoicechannel.cpp
+++ b/indra/newview/llvoicechannel.cpp
@@ -316,8 +316,6 @@ void LLVoiceChannel::activate()
}
}
- sCurrentVoiceChannelChangedSignal(this->mSessionID);
-
if (mState == STATE_NO_CHANNEL_INFO)
{
// responsible for setting status to active
@@ -327,6 +325,9 @@ void LLVoiceChannel::activate()
{
setState(STATE_CALL_STARTED);
}
+
+ //do not send earlier, channel should be initialized, should not be in STATE_NO_CHANNEL_INFO state
+ sCurrentVoiceChannelChangedSignal(this->mSessionID);
}
void LLVoiceChannel::getChannelInfo()