PHOE-3836: Fixed crash when enabling voice and clicking device settings without applying first

Tue, 06 Mar 2012 18:11:28 -0800

author
Kadah_Coba <kadah.coba@gmail.com>
date
Tue, 06 Mar 2012 18:11:28 -0800
changeset 1663
351a8540fccc
parent 1662
7b42903904ff
child 1664
f9cd471c38bf

PHOE-3836: Fixed crash when enabling voice and clicking device settings without applying first
Prevents opening device setting till settings are applied

indra/newview/llprefsvoice.cpp file | annotate | diff | revisions
     1.1 --- a/indra/newview/llprefsvoice.cpp	Tue Mar 06 17:02:17 2012 -0800
     1.2 +++ b/indra/newview/llprefsvoice.cpp	Tue Mar 06 18:11:28 2012 -0800
     1.3 @@ -185,7 +185,10 @@
     1.4  	self->childSetEnabled("enable_lip_sync_check", enable);
     1.5  	self->childSetEnabled("set_voice_hotkey_button", enable);
     1.6  	self->childSetEnabled("set_voice_middlemouse_button", enable);
     1.7 -	self->childSetEnabled("device_settings_btn", enable);
     1.8 +
     1.9 +    // PHOE-3836: Don't allow device settings unless voice is actually enabled, otherwise may cause crash (KC)
    1.10 +	bool voice_enable = !gSavedSettings.getBOOL("CmdLineDisableVoice") && gSavedSettings.getBOOL("EnableVoiceChat");
    1.11 +	self->childSetEnabled("device_settings_btn", voice_enable);
    1.12  }
    1.13  
    1.14  //static

mercurial