diff options
| author | Andrew Dyukov <adyukov@productengine.com> | 2010-01-29 15:16:11 +0200 |
|---|---|---|
| committer | Andrew Dyukov <adyukov@productengine.com> | 2010-01-29 15:16:11 +0200 |
| commit | 10cbb9ea27e8e47a235efece1b30365b7f00e038 (patch) | |
| tree | 2c24ad6026d4b40bf22c65cfa97c05b09c7e793a /indra/newview | |
| parent | 943f8afa09480629ad659de9601b36b3dc565246 (diff) | |
Fixed low bug EXT-4749 (There is misleading notification after voice has been turned off from preferences)
- Added skipping "Voice not available at your current location" when agent voice is disabled
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llvoicechannel.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llvoicechannel.cpp b/indra/newview/llvoicechannel.cpp index 589999c026..9d49fb69d6 100644 --- a/indra/newview/llvoicechannel.cpp +++ b/indra/newview/llvoicechannel.cpp @@ -698,7 +698,11 @@ void LLVoiceChannelProximal::handleStatusChange(EStatusType status) // do not notify user when leaving proximal channel return; case STATUS_VOICE_DISABLED: - LLCallInfoDialog::show("unavailable", mNotifyArgs); + //skip showing "Voice not available at your current location" when agent voice is disabled (EXT-4749) + if(LLVoiceClient::voiceEnabled() && gVoiceClient->voiceWorking()) + { + LLCallInfoDialog::show("unavailable", mNotifyArgs); + } return; default: break; |