diff options
| author | bea@american.lindenlab.com <bea@american.lindenlab.com> | 2009-12-04 13:29:05 -0800 |
|---|---|---|
| committer | bea@american.lindenlab.com <bea@american.lindenlab.com> | 2009-12-04 13:29:05 -0800 |
| commit | dab659adea63c744aa72c27935f62cce91d8ab7a (patch) | |
| tree | 8bcc1d3b5ebb46e64efc4ff784e5e27844f01da0 /indra/newview/llpanelimcontrolpanel.cpp | |
| parent | 67d051e78cb9f7d1ba670b647229ac9974fb7896 (diff) | |
| parent | bef221e3aa42b92586e5783811742afdbf05cd92 (diff) | |
merge
Diffstat (limited to 'indra/newview/llpanelimcontrolpanel.cpp')
| -rw-r--r-- | indra/newview/llpanelimcontrolpanel.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp index 405c95fc22..8c19865550 100644 --- a/indra/newview/llpanelimcontrolpanel.cpp +++ b/indra/newview/llpanelimcontrolpanel.cpp @@ -71,6 +71,11 @@ void LLPanelChatControlPanel::onVoiceChannelStateChanged(const LLVoiceChannel::E childSetVisible("call_btn", ! is_call_started); } +LLPanelChatControlPanel::~LLPanelChatControlPanel() +{ + mVoiceChannelStateChangeConnection.disconnect(); +} + BOOL LLPanelChatControlPanel::postBuild() { childSetAction("call_btn", boost::bind(&LLPanelChatControlPanel::onCallButtonClicked, this)); @@ -113,7 +118,9 @@ void LLPanelChatControlPanel::setSessionId(const LLUUID& session_id) mSessionId = session_id; LLVoiceChannel* voice_channel = LLIMModel::getInstance()->getVoiceChannel(mSessionId); if(voice_channel) - voice_channel->setStateChangedCallback(boost::bind(&LLPanelChatControlPanel::onVoiceChannelStateChanged, this, _1, _2)); + { + mVoiceChannelStateChangeConnection = voice_channel->setStateChangedCallback(boost::bind(&LLPanelChatControlPanel::onVoiceChannelStateChanged, this, _1, _2)); + } } LLPanelIMControlPanel::LLPanelIMControlPanel() |