diff options
author | Nyx Linden <nyx@lindenlab.com> | 2013-08-16 19:31:16 -0400 |
---|---|---|
committer | Nyx Linden <nyx@lindenlab.com> | 2013-08-16 19:31:16 -0400 |
commit | 5ae117aff6bfbc3c07876146ca270129dd91a047 (patch) | |
tree | 462f491cc055aa296b9da0041a322cd9512c045b /indra/newview/llvoiceclient.cpp | |
parent | 8abd6ed6b8c294ec6bfca59929dbcc71cd65c3a3 (diff) | |
parent | 32b8d398eca5eaa4ca99aa48839ad64d97954cae (diff) |
merge with 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) |