diff options
| author | Richard Linden <none@none> | 2011-05-03 15:00:49 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-05-03 15:00:49 -0700 |
| commit | 29a2e3f2a4cf7c57adb7a6bfcd71ac960867288d (patch) | |
| tree | ab676a02a67a9838183bdd6239b41252fc34d058 /indra/newview/llpanelvoicedevicesettings.cpp | |
| parent | 315eee3a7c87c5ee2154013d3fa0356c80bfab2e (diff) | |
| parent | d5faa4f38d338777463b7ad6eb3239041d43fe28 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge
Diffstat (limited to 'indra/newview/llpanelvoicedevicesettings.cpp')
| -rw-r--r-- | indra/newview/llpanelvoicedevicesettings.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelvoicedevicesettings.cpp b/indra/newview/llpanelvoicedevicesettings.cpp index aef870d352..d13f57bd6a 100644 --- a/indra/newview/llpanelvoicedevicesettings.cpp +++ b/indra/newview/llpanelvoicedevicesettings.cpp @@ -316,6 +316,6 @@ void LLPanelVoiceDeviceSettings::onCommitOutputDevice() if(LLVoiceClient::getInstance()) { LLVoiceClient::getInstance()->setRenderDevice( - getChild<LLComboBox>("voice_input_device")->getValue().asString()); + getChild<LLComboBox>("voice_output_device")->getValue().asString()); } } |