diff options
| author | Palmer <palmer@lindenlab.com> | 2009-12-08 10:00:32 -0800 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2009-12-08 10:00:32 -0800 |
| commit | 74f2cb2a70ddad7fe8819fd6855831e0615dc8d5 (patch) | |
| tree | 61f2ce7a6cfb5963b7517a582164047a6833757b /indra/newview/llcallfloater.cpp | |
| parent | cd138869d5bfcf40d3d13d7b887e36263e2919d9 (diff) | |
| parent | e07ef0d0e0e8cbd58afd4c6ee970634bd2f783e7 (diff) | |
Grabbed more viewer 2 changes that should fix parabuild problem
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(); } |