summaryrefslogtreecommitdiff
path: root/indra/newview/llvoicevivox.h
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2018-09-04 05:12:59 +0300
committerAndreyL ProductEngine <alihatskiy@productengine.com>2018-09-04 05:12:59 +0300
commitb5162156bd50bbb0fbad847de50136a97be87309 (patch)
tree98ce1bf699dfe362f77b5143315be748a44d1945 /indra/newview/llvoicevivox.h
parent6dbab946841cd80a99d74b623d2eae24ddbb6c72 (diff)
parent6f54add8a8852c8f3df86abebe38ef0ce4a6742c (diff)
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llvoicevivox.h')
-rw-r--r--indra/newview/llvoicevivox.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h
index 9d4af85c8c..50862cea1e 100644
--- a/indra/newview/llvoicevivox.h
+++ b/indra/newview/llvoicevivox.h
@@ -432,10 +432,10 @@ protected:
//----------------------------------
// devices
void clearCaptureDevices();
- void addCaptureDevice(const std::string& name);
+ void addCaptureDevice(const LLVoiceDevice& device);
void clearRenderDevices();
void setDevicesListUpdated(bool state);
- void addRenderDevice(const std::string& name);
+ void addRenderDevice(const LLVoiceDevice& device);
void buildSetAudioDevices(std::ostringstream &stream);
void getCaptureDevicesSendMessage();