diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-05-04 23:39:10 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-05-04 23:39:10 +0300 |
commit | 89e17d1780f498601c51e8c01ca963fb0c1b4d0b (patch) | |
tree | 8f9a4281a013ac04d3c15affc5ab72ead1df3a50 /indra/newview/llvoicevivox.cpp | |
parent | 4ac08f1ac5b003b95fc9087183d03c0291f6554b (diff) | |
parent | 4a7fd0117a43dca9e30c58c6417ebdf6862561f6 (diff) |
Merge branch 'master' into DRTVWR-482
Diffstat (limited to 'indra/newview/llvoicevivox.cpp')
-rw-r--r-- | indra/newview/llvoicevivox.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index 739f7bd47c..530adb8975 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -5158,6 +5158,7 @@ void LLVivoxVoiceClient::setVoiceEnabled(bool enabled) { // Turning voice off looses your current channel -- this makes sure the UI isn't out of sync when you re-enable it. LLVoiceChannel::getCurrentVoiceChannel()->deactivate(); + gAgent.setVoiceConnected(false); status = LLVoiceClientStatusObserver::STATUS_VOICE_DISABLED; } |