diff options
| author | bea@american.lindenlab.com <bea@american.lindenlab.com> | 2009-12-09 12:53:35 -0800 |
|---|---|---|
| committer | bea@american.lindenlab.com <bea@american.lindenlab.com> | 2009-12-09 12:53:35 -0800 |
| commit | 874f53230dbe40e599e8903fae87a60816508fd6 (patch) | |
| tree | 6affd304d74261bd45f13eff4c1521b580ae8bc1 /indra/newview/llcallfloater.cpp | |
| parent | 0bf7917ae848388a3e1bc6ad13e300880fed12d0 (diff) | |
| parent | 431bfca2ade364dc1165e402537e5e2d3616ebfd (diff) | |
merge
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(); } |