summaryrefslogtreecommitdiff
path: root/indra/newview/llavataractions.cpp
diff options
context:
space:
mode:
authorIgor Borovkov <iborovkov@productengine.com>2010-04-02 17:24:44 +0300
committerIgor Borovkov <iborovkov@productengine.com>2010-04-02 17:24:44 +0300
commit16b22d4abe99f8b43628db9db8142d65f431b062 (patch)
tree079db718f06c6ed35267db5fe35b1dbd7f2de28f /indra/newview/llavataractions.cpp
parentf4f05ad4dfc1ae47ffad0c9e2d26c4123d7f42c1 (diff)
parent7d38dd51c2a59d173bee9c04737002313f4b9dec (diff)
merge
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llavataractions.cpp')
-rw-r--r--indra/newview/llavataractions.cpp2
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