summaryrefslogtreecommitdiff
path: root/indra/newview/llavataractions.cpp
diff options
context:
space:
mode:
authorRoxanne Skelly <roxie@lindenlab.com>2009-07-15 21:50:42 +0000
committerRoxanne Skelly <roxie@lindenlab.com>2009-07-15 21:50:42 +0000
commitff52ac089f9ed67410f80fe66d0b997f0f2dafcc (patch)
treebc0f195c198ddf3d6d338e48f79e419c246f03fa /indra/newview/llavataractions.cpp
parentff51d31af3d3c28e474c2831b38bbefa6f7732c5 (diff)
DEV-34822 viewer 1.23 merge
DEV-32649 Merge the diamondware/vivox voice code -r124876 -r125220
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 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();
}
}