summaryrefslogtreecommitdiff
path: root/indra/newview/llvoiceclient.cpp
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2019-11-12 04:24:35 +0200
committerAndreyL ProductEngine <alihatskiy@productengine.com>2019-11-12 04:24:35 +0200
commit91fa31c065a582b9ead8a3d2f537c9b3d72474ee (patch)
tree50a83e42321a2b611df7c8e3f72ef452f868c591 /indra/newview/llvoiceclient.cpp
parent2d69438ee37a2224698418c2d00b19015b70b2b5 (diff)
parentf13cc44f8999a9897c77411d1296582b7bc1f08d (diff)
Downstream merge from lindenlab/viewer-serval
Diffstat (limited to 'indra/newview/llvoiceclient.cpp')
-rw-r--r--indra/newview/llvoiceclient.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index bce399a940..cc590fc947 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -116,7 +116,7 @@ std::string LLVoiceClientStatusObserver::status2string(LLVoiceClientStatusObserv
///////////////////////////////////////////////////////////////////////////////////////////////
-LLVoiceClient::LLVoiceClient()
+LLVoiceClient::LLVoiceClient(LLPumpIO *pump)
:
mVoiceModule(NULL),
m_servicePump(NULL),
@@ -133,6 +133,7 @@ LLVoiceClient::LLVoiceClient()
mDisableMic(false)
{
updateSettings();
+ init(pump);
}
//---------------------------------------------------