diff options
author | Baker Linden <baker@lindenlab.com> | 2013-09-30 17:27:25 -0700 |
---|---|---|
committer | Baker Linden <baker@lindenlab.com> | 2013-09-30 17:27:25 -0700 |
commit | ce526d40638fcc78724913621ee5c12f792f1859 (patch) | |
tree | 735e03596926582d70d1609754d4e91fd6f49b77 /indra/newview/llvoiceclient.cpp | |
parent | 34f561db55868185f0a946009f41f4f212366484 (diff) | |
parent | ad777b46d0fe5d790e43efb1771e9f64f3ad3dfb (diff) |
Merge with voorhees (viewer-release)
Diffstat (limited to 'indra/newview/llvoiceclient.cpp')
-rwxr-xr-x | indra/newview/llvoiceclient.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index b46c55321c..af55c8f741 100755 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -714,14 +714,7 @@ BOOL LLVoiceClient::isParticipantAvatar(const LLUUID& id) BOOL LLVoiceClient::isOnlineSIP(const LLUUID& id) { - if (mVoiceModule) - { - return mVoiceModule->isOnlineSIP(id); - } - else - { return FALSE; - } } BOOL LLVoiceClient::getIsSpeaking(const LLUUID& id) |