summaryrefslogtreecommitdiff
path: root/indra/newview/llcallfloater.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-04-21 11:33:12 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-04-21 11:33:12 +0100
commit6985ed5c799dc10a1afe14fee6338a0243191753 (patch)
tree4711416a05284462f71436cf3e07a979660533cb /indra/newview/llcallfloater.cpp
parent50b4783ad317b82791273c2d3b6e4260f7a5e77e (diff)
parent3d313630009366261ab99527fdd6eb7bb5eb5d3c (diff)
merge from viewer-trunk
Diffstat (limited to 'indra/newview/llcallfloater.cpp')
-rw-r--r--indra/newview/llcallfloater.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp
index d15c5f9bf4..5a96613870 100644
--- a/indra/newview/llcallfloater.cpp
+++ b/indra/newview/llcallfloater.cpp
@@ -228,7 +228,7 @@ void LLCallFloater::leaveCall()
LLVoiceChannel* voice_channel = LLVoiceChannel::getCurrentVoiceChannel();
if (voice_channel)
{
- voice_channel->deactivate();
+ gIMMgr->endCall(voice_channel->getSessionID());
}
}