summaryrefslogtreecommitdiff
path: root/indra/newview/llvoicechannel.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2009-11-06 21:04:04 +0200
committerVadim Savchuk <vsavchuk@productengine.com>2009-11-06 21:04:04 +0200
commitf716bb1e3afd4c950c379dfa702246979de467e6 (patch)
tree48bbde155d34027fae238a5a17691901c9ad3ad7 /indra/newview/llvoicechannel.cpp
parentdae2e04f1930404296f39a39ec91c8cdb95eb733 (diff)
Backed out changeset c3b8509f465a (EXT-989) as causing numerous conflicts.
Will reapply the changes later. --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llvoicechannel.cpp')
-rw-r--r--indra/newview/llvoicechannel.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llvoicechannel.cpp b/indra/newview/llvoicechannel.cpp
index 5ab3a2aaf3..cefc88ebee 100644
--- a/indra/newview/llvoicechannel.cpp
+++ b/indra/newview/llvoicechannel.cpp
@@ -46,7 +46,6 @@ LLVoiceChannel::voice_channel_map_t LLVoiceChannel::sVoiceChannelMap;
LLVoiceChannel::voice_channel_map_uri_t LLVoiceChannel::sVoiceChannelURIMap;
LLVoiceChannel* LLVoiceChannel::sCurrentVoiceChannel = NULL;
LLVoiceChannel* LLVoiceChannel::sSuspendedVoiceChannel = NULL;
-LLVoiceChannel::channel_changed_signal_t LLVoiceChannel::sCurrentVoiceChannelChanged;
BOOL LLVoiceChannel::sSuspended = FALSE;
@@ -321,8 +320,6 @@ void LLVoiceChannel::activate()
{
setState(STATE_CALL_STARTED);
}
-
- sCurrentVoiceChannelChanged(this->mSessionID);
}
void LLVoiceChannel::getChannelInfo()