diff options
author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-08-22 03:02:59 +0300 |
---|---|---|
committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-08-22 03:02:59 +0300 |
commit | e041ffc5ff7136ccb52b91b9ee05b18b46516283 (patch) | |
tree | 246606fc33ae0735130e070c3837afcf78b0b71a /indra/newview/llvoicevivox.h | |
parent | 714e89d55a0bfbec26cf950f816f2963ec7c9682 (diff) | |
parent | 6f54add8a8852c8f3df86abebe38ef0ce4a6742c (diff) |
Merged in lindenlab/viewer-release
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(); |