diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-05-04 16:09:14 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-05-04 16:09:14 -0700 |
| commit | a11ec0c89f618cb9d039274e850356694a28dbb1 (patch) | |
| tree | 42f4e2637220af26a68dcf8acaa8dbf042082dbc /indra/newview/llpanelpeople.cpp | |
| parent | 8daf25b65c30f58889ed5923d43bf785cb758026 (diff) | |
| parent | 7d8b37f72488ce30503d97d88e804160b11c6eff (diff) | |
Automated 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 f2c0f92f9b..0a4af00f78 100644 --- a/indra/newview/llpanelpeople.cpp +++ b/indra/newview/llpanelpeople.cpp @@ -624,7 +624,7 @@ BOOL LLPanelPeople::postBuild() if(recent_view_sort) mRecentViewSortMenuHandle = recent_view_sort->getHandle(); - gVoiceClient->addObserver(this); + LLVoiceClient::getInstance()->addObserver(this); // call this method in case some list is empty and buttons can be in inconsistent state updateButtons(); @@ -825,7 +825,7 @@ void LLPanelPeople::updateButtons() } } - bool enable_calls = gVoiceClient->voiceWorking() && gVoiceClient->voiceEnabled(); + bool enable_calls = LLVoiceClient::getInstance()->isVoiceWorking() && LLVoiceClient::getInstance()->voiceEnabled(); buttonSetEnabled("teleport_btn", friends_tab_active && item_selected && isFriendOnline(selected_uuids.front())); buttonSetEnabled("view_profile_btn", item_selected); |