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/llavataractions.cpp | |
| parent | 25df7aca29074b6ae7f108c91673be117522bfc9 (diff) | |
| parent | 3ecec85feb4e9878b32f5737ab8e35747360f138 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llavataractions.cpp')
| -rw-r--r-- | indra/newview/llavataractions.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index 48a85dc73f..c85c72837c 100644 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -282,7 +282,7 @@ bool LLAvatarActions::isCalling(const LLUUID &id) //static bool LLAvatarActions::canCall() { - return LLVoiceClient::getInstance()->voiceEnabled() && LLVoiceClient::getInstance()->isVoiceWorking(); + return LLVoiceClient::voiceEnabled() && gVoiceClient->voiceWorking(); } // static |