diff options
| author | Armin Weatherwax | 2011-03-20 01:37:07 +0100 |
|---|---|---|
| committer | Jacek Antonelli | 2011-05-13 19:26:28 -0500 |
| commit | 9e43710ca3fd9352581355d92f27a3952090f8af (patch) | |
| tree | ae5bc2c4684d81bf92266c9d466224368db8d775 /linden | |
| parent | fix voice doesn't kick in. (diff) | |
| download | meta-impy-9e43710ca3fd9352581355d92f27a3952090f8af.zip meta-impy-9e43710ca3fd9352581355d92f27a3952090f8af.tar.gz meta-impy-9e43710ca3fd9352581355d92f27a3952090f8af.tar.bz2 meta-impy-9e43710ca3fd9352581355d92f27a3952090f8af.tar.xz | |
fix: voice always on, even if told not to be
introduced by 56bf45f >_>
(cherry picked from commit 8f92d7925f2ba9259a6597c80584b09e023902da)
Diffstat (limited to '')
| -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 a6cec7b..dadc4e6 100644 --- a/linden/indra/newview/llvoiceclient.cpp +++ b/linden/indra/newview/llvoiceclient.cpp | |||
| @@ -1529,7 +1529,9 @@ void LLVoiceClient::stateMachine() | |||
| 1529 | { | 1529 | { |
| 1530 | 1530 | ||
| 1531 | // Disable voice as long as the viewer is disconnected from the sim (login/relog) | 1531 | // Disable voice as long as the viewer is disconnected from the sim (login/relog) |
| 1532 | setVoiceEnabled(!gDisconnected); | 1532 | setVoiceEnabled(!gDisconnected |
| 1533 | && gSavedSettings.getBOOL("EnableVoiceChat") | ||
| 1534 | && !gSavedSettings.getBOOL("CmdLineDisableVoice") ); | ||
| 1533 | 1535 | ||
| 1534 | if(mVoiceEnabled) | 1536 | if(mVoiceEnabled) |
| 1535 | { | 1537 | { |