diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-04-22 15:10:36 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-04-22 15:10:36 -0700 |
| commit | cdc42c49b24415448baf32e4ef40f56ffe697bb3 (patch) | |
| tree | 8bbfa5f51ea70d1b48015efa75b57803d9b40d05 /indra/newview/llpanelgroup.cpp | |
| parent | 6837f660380d1d5ddff021e6c14273937ff11036 (diff) | |
| parent | 5e727964dbd6d5e55dd3a0921e8e1f0f77a99747 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llpanelgroup.cpp')
| -rw-r--r-- | indra/newview/llpanelgroup.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelgroup.cpp b/indra/newview/llpanelgroup.cpp index c00b6a4147..716166a945 100644 --- a/indra/newview/llpanelgroup.cpp +++ b/indra/newview/llpanelgroup.cpp @@ -201,7 +201,7 @@ BOOL LLPanelGroup::postBuild() mJoinText = panel_general->getChild<LLUICtrl>("join_cost_text"); } - gVoiceClient->addObserver(this); + LLVoiceClient::getInstance()->addObserver(this); return TRUE; } @@ -322,7 +322,7 @@ void LLPanelGroup::onChange(EStatusType status, const std::string &channelURI, b return; } - childSetEnabled("btn_call", LLVoiceClient::voiceEnabled() && gVoiceClient->voiceWorking()); + childSetEnabled("btn_call", LLVoiceClient::getInstance()->voiceEnabled() && LLVoiceClient::getInstance()->isVoiceWorking()); } void LLPanelGroup::notifyObservers() |