summaryrefslogtreecommitdiff
path: root/indra/newview/llvoicevivox.cpp
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2010-02-25 14:12:18 -0800
committerRoxie Linden <roxie@lindenlab.com>2010-02-25 14:12:18 -0800
commit0ac14158bcec40e65fb26d2fea7555ede1e2ca94 (patch)
treebacf3b28ac4de7f69da67d7616923dafe92b0d49 /indra/newview/llvoicevivox.cpp
parent92cef0426df15c0e661fa795e6b00214f381dd05 (diff)
parentab0c9c6754836cb26a520d0a9b2d7bbdd13a5f32 (diff)
automated merge from trunk
Diffstat (limited to 'indra/newview/llvoicevivox.cpp')
-rw-r--r--indra/newview/llvoicevivox.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 03b03b3884..5fa522a6b5 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -4584,6 +4584,11 @@ BOOL LLVivoxVoiceClient::isOnlineSIP(const LLUUID &id)
return result;
}
+bool LLVivoxVoiceClient::isVoiceWorking()
+{
+ return (stateLoggedIn <= mState) && (mState <= stateLeavingSession);
+}
+
// Returns true if the indicated participant in the current audio session is really an SL avatar.
// Currently this will be false only for PSTN callers into group chats, and PSTN p2p calls.
BOOL LLVivoxVoiceClient::isParticipantAvatar(const LLUUID &id)