diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-08-08 09:26:36 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-08-08 09:26:36 -0700 |
| commit | e0cc3cbd977dcfbe4ef8409b8484a30b2c63dcc1 (patch) | |
| tree | d96e036d18bae1ddd3704b4abd55fe6565844d80 /indra/newview/llvoiceclient.cpp | |
| parent | 6354ad379d0850b4cc3969130fb1b30b0e2c0ee9 (diff) | |
| parent | 32b8d398eca5eaa4ca99aa48839ad64d97954cae (diff) | |
Merge with 3.6.2-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) |