summaryrefslogtreecommitdiff
path: root/indra/newview/llvoiceclient.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-08-05 14:11:52 -0700
committerMerov Linden <merov@lindenlab.com>2013-08-05 14:11:52 -0700
commitf6c7b7ac76725a2364f323aba671d12b6cd552a8 (patch)
tree6ce21a5e956181fe2bdb9b9190d863bf04e0d735 /indra/newview/llvoiceclient.cpp
parent152d76e13ee553e9c9191a14053b119583b21abc (diff)
parent32b8d398eca5eaa4ca99aa48839ad64d97954cae (diff)
Pull merge from lindenlab/viewer-release
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)