aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llvoiceclient.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llvoiceclient.cpp')
-rw-r--r--linden/indra/newview/llvoiceclient.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llvoiceclient.cpp b/linden/indra/newview/llvoiceclient.cpp
index 2266aab..63362be 100644
--- a/linden/indra/newview/llvoiceclient.cpp
+++ b/linden/indra/newview/llvoiceclient.cpp
@@ -4679,11 +4679,11 @@ void LLVoiceClient::messageEvent(
4679 { 4679 {
4680 bool is_busy = gAgent.getBusy(); 4680 bool is_busy = gAgent.getBusy();
4681 bool is_muted = LLMuteList::getInstance()->isMuted(session->mCallerID, session->mName, LLMute::flagTextChat); 4681 bool is_muted = LLMuteList::getInstance()->isMuted(session->mCallerID, session->mName, LLMute::flagTextChat);
4682 bool is_linden = LLMuteList::getInstance()->isLinden(session->mName); 4682 bool is_god = LLMuteList::getInstance()->isGod(session->mName);
4683 bool quiet_chat = false; 4683 bool quiet_chat = false;
4684 LLChat chat; 4684 LLChat chat;
4685 4685
4686 chat.mMuted = is_muted && !is_linden; 4686 chat.mMuted = is_muted && !is_god;
4687 4687
4688 if(!chat.mMuted) 4688 if(!chat.mMuted)
4689 { 4689 {
@@ -4691,7 +4691,7 @@ void LLVoiceClient::messageEvent(
4691 chat.mFromName = session->mName; 4691 chat.mFromName = session->mName;
4692 chat.mSourceType = CHAT_SOURCE_AGENT; 4692 chat.mSourceType = CHAT_SOURCE_AGENT;
4693 4693
4694 if(is_busy && !is_linden) 4694 if(is_busy && !is_god)
4695 { 4695 {
4696 quiet_chat = true; 4696 quiet_chat = true;
4697 // TODO: Question: Return busy mode response here? Or maybe when session is started instead? 4697 // TODO: Question: Return busy mode response here? Or maybe when session is started instead?