diff options
| author | Andrew Dyukov <adyukov@productengine.com> | 2010-02-03 21:48:30 +0200 |
|---|---|---|
| committer | Andrew Dyukov <adyukov@productengine.com> | 2010-02-03 21:48:30 +0200 |
| commit | a1c3d608199a888584ce8d2172905175fcbd1796 (patch) | |
| tree | e00db87e06a06604a4d5b9eeb25ff0bf60a7c309 /indra/newview | |
| parent | d90dc965874687a40f6ffc90f7edec1301fe293b (diff) | |
No ticket. Removed unrelevant comment and added disabling call button if session doesn't exist in LLPanelChatControlPanel::updateCallButton().
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llpanelimcontrolpanel.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp index d491583b56..cbd6f64a48 100644 --- a/indra/newview/llpanelimcontrolpanel.cpp +++ b/indra/newview/llpanelimcontrolpanel.cpp @@ -81,11 +81,15 @@ void LLPanelChatControlPanel::onVoiceChannelStateChanged(const LLVoiceChannel::E void LLPanelChatControlPanel::updateCallButton() { - // hide/show call button bool voice_enabled = LLVoiceClient::voiceEnabled() && gVoiceClient->voiceWorking(); LLIMModel::LLIMSession* session = LLIMModel::getInstance()->findIMSession(mSessionId); - if (!session) return; + + if (!session) + { + childSetEnabled("call_btn", false); + return; + } bool session_initialized = session->mSessionInitialized; bool callback_enabled = session->mCallBackEnabled; |