diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2018-12-16 13:51:15 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2018-12-16 13:51:15 -0500 |
commit | f5f504b0f946582efc85b0e76f38e9242aed11bb (patch) | |
tree | 5367768d3d45352966456e15b950aa4de2fb3d7a /indra/newview/llvoicevivox.cpp | |
parent | 3c53f8abded5da7e9743b743170538a1ede5635a (diff) | |
parent | a3b3ad727f53aa280ffbcc1b61ccfbb48e988708 (diff) |
DRTVWR-447: Merge up to latest viewer-release
Diffstat (limited to 'indra/newview/llvoicevivox.cpp')
-rw-r--r-- | indra/newview/llvoicevivox.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index dd35ed4c71..cf40058c34 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -4725,6 +4725,11 @@ void LLVivoxVoiceClient::declineInvite(std::string &sessionHandle) } } +bool LLVivoxVoiceClient::singletoneInstanceExists() +{ + return LLVivoxVoiceClient::instanceExists(); +} + void LLVivoxVoiceClient::leaveNonSpatialChannel() { LL_DEBUGS("Voice") << "Request to leave spacial channel." << LL_ENDL; |