diff options
author | Anchor Linden <anchor@lindenlab.com> | 2018-09-17 10:50:08 -0700 |
---|---|---|
committer | Anchor Linden <anchor@lindenlab.com> | 2018-09-17 10:50:08 -0700 |
commit | e5aeaa659a453674ef898cdd2ad6183d5eb77e41 (patch) | |
tree | 2c7196f2f80d11b6f6d660c5852299646f2d449a /indra/newview/llvoicevivox.h | |
parent | 7318bd61f7a7ea89e471a6e0f3cc310786a3b41c (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(); |