diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-04-07 10:27:10 -0700 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-04-07 10:27:10 -0700 |
| commit | de62c3378171a69ff9a39f2f626f1b1d33d0763f (patch) | |
| tree | 053883ba8ae6d02460736ed8a786f1913761b00d /indra/newview/llpanelpeople.cpp | |
| parent | 25df7aca29074b6ae7f108c91673be117522bfc9 (diff) | |
| parent | 3ecec85feb4e9878b32f5737ab8e35747360f138 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llpanelpeople.cpp')
| -rw-r--r-- | indra/newview/llpanelpeople.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp index 4c24670f47..5802d53cd1 100644 --- a/indra/newview/llpanelpeople.cpp +++ b/indra/newview/llpanelpeople.cpp @@ -619,7 +619,7 @@ BOOL LLPanelPeople::postBuild() if(recent_view_sort) mRecentViewSortMenuHandle = recent_view_sort->getHandle(); - LLVoiceClient::getInstance()->addObserver(this); + gVoiceClient->addObserver(this); // call this method in case some list is empty and buttons can be in inconsistent state updateButtons(); @@ -809,7 +809,7 @@ void LLPanelPeople::updateButtons() } } - bool enable_calls = LLVoiceClient::getInstance()->isVoiceWorking() && LLVoiceClient::getInstance()->voiceEnabled(); + bool enable_calls = gVoiceClient->voiceWorking() && gVoiceClient->voiceEnabled(); buttonSetEnabled("teleport_btn", friends_tab_active && item_selected && isFriendOnline(selected_uuids.front())); buttonSetEnabled("view_profile_btn", item_selected); |