diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-04-07 11:08:04 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-04-07 11:08:04 -0700 |
| commit | 658ccc3e85487f9f24ff3b5926e60d6cce7f42e0 (patch) | |
| tree | fe3f862878af5793aeec797d63c1d7c114d3c68d /indra/newview/llpanelimcontrolpanel.cpp | |
| parent | 0bb3f144c0a6712a269246975635962b3b5f48d0 (diff) | |
Re-insert backed out SLE checkin so we can fix it
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; } |