summaryrefslogtreecommitdiff
path: root/indra/newview/llvoiceclient.cpp
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2013-08-19 16:12:07 -0600
committerXiaohong Bao <bao@lindenlab.com>2013-08-19 16:12:07 -0600
commit1616b73ef30bcb3e99be68fb7ccc05f0be78ddf6 (patch)
treee22c94948ed8d8c7f35422fc064172ea3662b264 /indra/newview/llvoiceclient.cpp
parentea45b8acd25785bd2789c2c1928e223c9a8e2fbd (diff)
parentd8c02bf06250015b8cb0bcc9c0d8445cfb6acf1c (diff)
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/llvoiceclient.cpp')
-rwxr-xr-xindra/newview/llvoiceclient.cpp7
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)