diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-08-22 00:23:29 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-08-22 00:23:29 +0100 |
| commit | 6d256d679e9cea63753266420ed79efa8b70dee2 (patch) | |
| tree | 45406673031f343d4550e0bc5e7379192a6e21eb /indra/newview/llvoicevivox.h | |
| parent | 4789fb3819a54954c9912a6c8442d8a37b594d28 (diff) | |
| parent | 6f54add8a8852c8f3df86abebe38ef0ce4a6742c (diff) | |
Merge
Diffstat (limited to 'indra/newview/llvoicevivox.h')
| -rw-r--r-- | indra/newview/llvoicevivox.h | 4 |
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(); |