summaryrefslogtreecommitdiff
path: root/indra/newview/llvoiceclient.cpp
diff options
context:
space:
mode:
authorsimon <none@none>2013-08-05 12:03:00 -0700
committersimon <none@none>2013-08-05 12:03:00 -0700
commitb50f54db591dfe6cb5304b6b29d50c2066c69747 (patch)
treeaa365f653e3273b2d765bd689a9182b960dff376 /indra/newview/llvoiceclient.cpp
parent570884d73007aea2438f3faa1181129a16bad359 (diff)
parent32b8d398eca5eaa4ca99aa48839ad64d97954cae (diff)
Merge viewer-release with Vivox code
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)