From ff52ac089f9ed67410f80fe66d0b997f0f2dafcc Mon Sep 17 00:00:00 2001 From: Roxanne Skelly Date: Wed, 15 Jul 2009 21:50:42 +0000 Subject: DEV-34822 viewer 1.23 merge DEV-32649 Merge the diamondware/vivox voice code -r124876 -r125220 --- indra/newview/llavataractions.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llavataractions.cpp') diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index c3deb602ee..118a546ada 100644 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -290,7 +290,7 @@ bool LLAvatarActions::canCall(const LLUUID &id) // can be only ONLINE. There is no way to see "usual resident" in OFFLINE status. If we see "usual // resident" it automatically means that the resident is ONLINE. So to make a call to the "usual resident" // we need to check only that "our" voice is enabled. - return LLVoiceClient::voiceEnabled(); + return LLVoiceClient::getInstance()->voiceEnabled(); } } -- cgit v1.2.3