diff options
| author | Roxanne Skelly <roxie@lindenlab.com> | 2009-07-15 21:50:42 +0000 |
|---|---|---|
| committer | Roxanne Skelly <roxie@lindenlab.com> | 2009-07-15 21:50:42 +0000 |
| commit | ff52ac089f9ed67410f80fe66d0b997f0f2dafcc (patch) | |
| tree | bc0f195c198ddf3d6d338e48f79e419c246f03fa /indra/newview/llpanelimcontrolpanel.cpp | |
| parent | ff51d31af3d3c28e474c2831b38bbefa6f7732c5 (diff) | |
DEV-34822 viewer 1.23 merge
DEV-32649 Merge the diamondware/vivox voice code
-r124876
-r125220
Diffstat (limited to 'indra/newview/llpanelimcontrolpanel.cpp')
| -rw-r--r-- | indra/newview/llpanelimcontrolpanel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp index b547997e7a..0111a200e8 100644 --- a/indra/newview/llpanelimcontrolpanel.cpp +++ b/indra/newview/llpanelimcontrolpanel.cpp @@ -92,7 +92,7 @@ BOOL LLPanelChatControlPanel::postBuild() void LLPanelChatControlPanel::draw() { // hide/show start call and end call buttons - bool voice_enabled = LLVoiceClient::voiceEnabled(); + bool voice_enabled = LLVoiceClient::getInstance()->voiceEnabled(); LLIMModel::LLIMSession* session = LLIMModel::getInstance()->findIMSession(mSessionId); if (!session) return; |