diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-03-01 15:31:04 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-03-01 15:31:04 -0800 |
| commit | b11a625e6ff89470d25273fa426ed13f7abc4a6a (patch) | |
| tree | a5e923a8211926f119f1cf45ded6cd4222c9250b /indra/newview/llpanelimcontrolpanel.cpp | |
| parent | 6575b685e91d334198789c88dec2efab7e5a1ac9 (diff) | |
| parent | a2efe4bb4154b7ecb9c7cb279f7a28d7d401a93a (diff) | |
Automated merge with a few fixups for code review comments
Diffstat (limited to 'indra/newview/llpanelimcontrolpanel.cpp')
| -rw-r--r-- | indra/newview/llpanelimcontrolpanel.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp index c34f0633b9..709bb83fe4 100644 --- a/indra/newview/llpanelimcontrolpanel.cpp +++ b/indra/newview/llpanelimcontrolpanel.cpp @@ -81,7 +81,8 @@ void LLPanelChatControlPanel::onVoiceChannelStateChanged(const LLVoiceChannel::E void LLPanelChatControlPanel::updateCallButton() { - bool voice_enabled = LLVoiceClient::voiceEnabled() && gVoiceClient->voiceWorking(); + // hide/show call button + bool voice_enabled = LLVoiceClient::getInstance()->voiceEnabled() && LLVoiceClient::getInstance()->isVoiceWorking(); LLIMModel::LLIMSession* session = LLIMModel::getInstance()->findIMSession(mSessionId); @@ -124,7 +125,7 @@ BOOL LLPanelChatControlPanel::postBuild() childSetAction("end_call_btn", boost::bind(&LLPanelChatControlPanel::onEndCallButtonClicked, this)); childSetAction("voice_ctrls_btn", boost::bind(&LLPanelChatControlPanel::onOpenVoiceControlsClicked, this)); - gVoiceClient->addObserver(this); + LLVoiceClient::getInstance()->addObserver(this); return TRUE; } |