livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXP-760 Selecting No Device for output and input in Sound Devices in Basic mode still results in voice having input and output - also 2 default options

master
Leyla Farazha 2011-05-11 17:46:51 -07:00
parent 91956a0f44
commit c83eff097e
2 changed files with 2 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
indra/newview/llpanelvoicedevicesettings.cpp
View File

@ -221,23 +221,7 @@ void LLPanelVoiceDeviceSettings::refresh()
iter != LLVoiceClient::getInstance()->getCaptureDevices().end();
iter++)
{
// Lets try to localize some system device names. EXT-8375
std::string device_name = *iter;
LLStringUtil::toLower(device_name); //compare in low case
if ("default system device" == device_name)
{
device_name = getString(device_name);
}
else if ("no device" == device_name)
{
device_name = getString(device_name);
}
else
{
// restore original value
device_name = *iter;
}
mCtrlInputDevices->add(device_name, ADD_BOTTOM );
mCtrlInputDevices->add( *iter, ADD_BOTTOM );
}
if(!mCtrlInputDevices->setSimple(mInputDevice))
@ -254,23 +238,7 @@ void LLPanelVoiceDeviceSettings::refresh()
for(iter= LLVoiceClient::getInstance()->getRenderDevices().begin();
iter != LLVoiceClient::getInstance()->getRenderDevices().end(); iter++)
{
// Lets try to localize some system device names. EXT-8375
std::string device_name = *iter;
LLStringUtil::toLower(device_name); //compare in low case
if ("default system device" == device_name)
{
device_name = getString(device_name);
}
else if ("no device" == device_name)
{
device_name = getString(device_name);
}
else
{
// restore original value
device_name = *iter;
}
mCtrlOutputDevices->add(device_name, ADD_BOTTOM );
mCtrlOutputDevices->add( *iter, ADD_BOTTOM );
}
if(!mCtrlOutputDevices->setSimple(mOutputDevice))

8
indra/newview/skins/default/xui/en/panel_sound_devices.xml
View File

@ -11,14 +11,6 @@
name="default_text">
Default
</panel.string>
<panel.string
name="default system device">
Default system device
</panel.string>
<panel.string
name="no device">
No device
</panel.string>
<icon
height="18"
image_name="Microphone_On"