diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-08 16:20:25 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-08 16:20:25 -0500 |
| commit | 45b24808657dddfb2a605186416409b453f149e7 (patch) | |
| tree | 298c49cfd6fb4f645a3a776a75b9bb64601bf9c3 /indra/newview/llcallfloater.cpp | |
| parent | 7ce49586881fd078ea8bceeab558b4a156b30f63 (diff) | |
| parent | 37848d29d9030e00086c3a499d28237cdf943e1b (diff) | |
merge
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llcallfloater.cpp')
| -rw-r--r-- | indra/newview/llcallfloater.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp index ad59c780f3..895b4ed80e 100644 --- a/indra/newview/llcallfloater.cpp +++ b/indra/newview/llcallfloater.cpp @@ -127,7 +127,7 @@ void LLCallFloater::onOpen(const LLSD& /*key*/) void LLCallFloater::leaveCall() { LLVoiceChannel* voice_channel = LLVoiceChannel::getCurrentVoiceChannel(); - if (voice_channel && voice_channel->isActive()) + if (voice_channel) { voice_channel->deactivate(); } |