diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-08-05 15:10:39 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-08-05 15:10:39 -0400 |
| commit | 91a91d1b23394bb0e3b0fb4af21703e3d6e9437a (patch) | |
| tree | 6eda4baca46b5df037bb2ffd4af76f5fa4b2e29f /indra/newview/llvoiceclient.cpp | |
| parent | b75213b39ad7456d04d3e1644f2116853ead0da0 (diff) | |
| parent | 32b8d398eca5eaa4ca99aa48839ad64d97954cae (diff) | |
merge changes for 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) |