diff options
| author | McCabe Maxsted | 2010-08-12 18:10:19 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2010-08-26 11:21:06 -0700 |
| commit | 5f501febd61c2ab3f378c8a13b84594d93023fe6 (patch) | |
| tree | de2a6c8b59a0d2d93a4032a54c5d8a520ca71371 /linden/indra/newview/llvoiceclient.cpp | |
| parent | Fixed #381: using voice causes viewer crash on disconnect/quit (diff) | |
| download | meta-impy-5f501febd61c2ab3f378c8a13b84594d93023fe6.zip meta-impy-5f501febd61c2ab3f378c8a13b84594d93023fe6.tar.gz meta-impy-5f501febd61c2ab3f378c8a13b84594d93023fe6.tar.bz2 meta-impy-5f501febd61c2ab3f378c8a13b84594d93023fe6.tar.xz | |
Added 'Reset Voice' button to Preferences > Voice from Emerald
Diffstat (limited to 'linden/indra/newview/llvoiceclient.cpp')
| -rw-r--r-- | linden/indra/newview/llvoiceclient.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llvoiceclient.cpp b/linden/indra/newview/llvoiceclient.cpp index 908bedb..660b60a 100644 --- a/linden/indra/newview/llvoiceclient.cpp +++ b/linden/indra/newview/llvoiceclient.cpp | |||
| @@ -1215,7 +1215,7 @@ void LLVoiceClient::terminate() | |||
| 1215 | 1215 | ||
| 1216 | void LLVoiceClient::updateSettings() | 1216 | void LLVoiceClient::updateSettings() |
| 1217 | { | 1217 | { |
| 1218 | setVoiceEnabled(gSavedSettings.getBOOL("EnableVoiceChat")); | 1218 | setVoiceEnabled(gSavedSettings.getBOOL("EnableVoiceChat") && !gSavedSettings.getBOOL("CmdLineDisableVoice")); |
| 1219 | setUsePTT(gSavedSettings.getBOOL("PTTCurrentlyEnabled")); | 1219 | setUsePTT(gSavedSettings.getBOOL("PTTCurrentlyEnabled")); |
| 1220 | std::string keyString = gSavedSettings.getString("PushToTalkButton"); | 1220 | std::string keyString = gSavedSettings.getString("PushToTalkButton"); |
| 1221 | setPTTKey(keyString); | 1221 | setPTTKey(keyString); |
| @@ -5821,7 +5821,7 @@ void LLVoiceClient::setVoiceEnabled(bool enabled) | |||
| 5821 | 5821 | ||
| 5822 | bool LLVoiceClient::voiceEnabled() | 5822 | bool LLVoiceClient::voiceEnabled() |
| 5823 | { | 5823 | { |
| 5824 | return gSavedSettings.getBOOL("EnableVoiceChat") && !gSavedSettings.getBOOL("CmdLineDisableVoice"); | 5824 | return LLVoiceClient::getInstance()->mVoiceEnabled;//gSavedSettings.getBOOL("EnableVoiceChat") && !gSavedSettings.getBOOL("CmdLineDisableVoice"); |
| 5825 | } | 5825 | } |
| 5826 | 5826 | ||
| 5827 | void LLVoiceClient::setLipSyncEnabled(BOOL enabled) | 5827 | void LLVoiceClient::setLipSyncEnabled(BOOL enabled) |