diff options
| author | McCabe Maxsted | 2011-03-19 17:52:05 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2011-03-19 17:52:05 -0700 |
| commit | bb265dfd551adbc0209d85f1b2d000a790111e08 (patch) | |
| tree | ea51c8d661adce642537a48c269016042fdb11a5 /linden | |
| parent | Added log info for when GStreamer fails to load because the plugin wasn't com... (diff) | |
| parent | fix: voice always on, even if told not to be (diff) | |
| download | meta-impy-bb265dfd551adbc0209d85f1b2d000a790111e08.zip meta-impy-bb265dfd551adbc0209d85f1b2d000a790111e08.tar.gz meta-impy-bb265dfd551adbc0209d85f1b2d000a790111e08.tar.bz2 meta-impy-bb265dfd551adbc0209d85f1b2d000a790111e08.tar.xz | |
Merge remote-tracking branch 'armin/exp' into exp
Diffstat (limited to 'linden')
| -rw-r--r-- | linden/indra/newview/llvoiceclient.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linden/indra/newview/llvoiceclient.cpp b/linden/indra/newview/llvoiceclient.cpp index c05f685..2266aab 100644 --- a/linden/indra/newview/llvoiceclient.cpp +++ b/linden/indra/newview/llvoiceclient.cpp | |||
| @@ -1539,7 +1539,9 @@ void LLVoiceClient::stateMachine() | |||
| 1539 | { | 1539 | { |
| 1540 | 1540 | ||
| 1541 | // Disable voice as long as the viewer is disconnected from the sim (login/relog) | 1541 | // Disable voice as long as the viewer is disconnected from the sim (login/relog) |
| 1542 | setVoiceEnabled(!gDisconnected); | 1542 | setVoiceEnabled(!gDisconnected |
| 1543 | && gSavedSettings.getBOOL("EnableVoiceChat") | ||
| 1544 | && !gSavedSettings.getBOOL("CmdLineDisableVoice") ); | ||
| 1543 | 1545 | ||
| 1544 | if(mVoiceEnabled) | 1546 | if(mVoiceEnabled) |
| 1545 | { | 1547 | { |