diff options
author | Roxie Linden <roxie@lindenlab.com> | 2010-04-21 18:17:11 -0700 |
---|---|---|
committer | Roxie Linden <roxie@lindenlab.com> | 2010-04-21 18:17:11 -0700 |
commit | 5b9da4e8d91acd075dfaf33fb489c480c25e9ade (patch) | |
tree | f296e32b384b341d9c626a4305cd7cd8924c9986 /indra/newview/llcallfloater.cpp | |
parent | c139e52a5bf1ca2273d4fd22f28f55b12ba8a2d7 (diff) | |
parent | 144b8349b3f0773ac575e178a0e3109d963be9a8 (diff) |
Automated 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 a022f62452..dd99c6564c 100644 --- a/indra/newview/llcallfloater.cpp +++ b/indra/newview/llcallfloater.cpp @@ -227,7 +227,7 @@ void LLCallFloater::leaveCall() LLVoiceChannel* voice_channel = LLVoiceChannel::getCurrentVoiceChannel(); if (voice_channel) { - voice_channel->deactivate(); + gIMMgr->endCall(voice_channel->getSessionID()); } } |