diff options
author | Merov Linden <merov@lindenlab.com> | 2013-08-05 12:14:48 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2013-08-05 12:14:48 -0700 |
commit | 74e3fb7b33fe584c887b4193f290e069e9ddffcd (patch) | |
tree | cbc80aa9a4eab2a8ba816278837ddaa04f98041b /indra/newview/llvoiceclient.cpp | |
parent | d9d1d2722737069618e15eac2f33ac4600c357ba (diff) | |
parent | 32b8d398eca5eaa4ca99aa48839ad64d97954cae (diff) |
Pull merge from lindenlab/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) |