diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-29 10:24:45 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-29 10:24:45 -0800 |
| commit | 9459fd9137a2901f964bb307348b13d222c8287b (patch) | |
| tree | 580499326c48072051dd6afcdd475e4676d1837c /indra/newview/llvoicechannel.cpp | |
| parent | a328cdc83015a46a87377ad3c822c730c03026a3 (diff) | |
| parent | 092f93b0c1084edf68fc0536aa03a3c7b816505b (diff) | |
PE merge.
Diffstat (limited to 'indra/newview/llvoicechannel.cpp')
| -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; |