summaryrefslogtreecommitdiff
path: root/indra/newview/llvoiceclient.cpp
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2013-08-19 16:09:28 -0600
committerXiaohong Bao <bao@lindenlab.com>2013-08-19 16:09:28 -0600
commitd8c02bf06250015b8cb0bcc9c0d8445cfb6acf1c (patch)
tree2e7966158d684828422c2b9f0d4129fa1ef1b395 /indra/newview/llvoiceclient.cpp
parent4290365ebbf5505bee4fbed8043996fa7687fd03 (diff)
parent171089207b528ab80a954292c127ba77254ee927 (diff)
Merge
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)