diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2010-04-05 15:12:12 -0700 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2010-04-05 15:12:12 -0700 |
commit | a0a7b7ed16a9161b8060e8f32e5594356e5c7329 (patch) | |
tree | 06809cac6cde316219cbcbf58a7381d907a9d5e6 /indra/newview/llavataractions.cpp | |
parent | 6b3ca581e037d52e507a69d82fd6d900bd4641b7 (diff) | |
parent | 9bfc1c3b1060f15990bba218795a1ef6009d1535 (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 c85c72837c..48a85dc73f 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::voiceEnabled() && gVoiceClient->voiceWorking(); + return LLVoiceClient::getInstance()->voiceEnabled() && LLVoiceClient::getInstance()->isVoiceWorking(); } // static |