aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llvoiceclient.cpp
diff options
context:
space:
mode:
authorDavid Seikel2011-02-25 05:58:41 +1000
committerDavid Seikel2011-02-25 05:58:41 +1000
commit8fa1dc90a9fec493b19604a4b4e08dc3208c7e8f (patch)
tree4cd1855e1658704d5eedd72dc64a95bc08b6c206 /linden/indra/newview/llvoiceclient.cpp
parentMerge branch 'weekly' into branding (diff)
downloadmeta-impy-8fa1dc90a9fec493b19604a4b4e08dc3208c7e8f.zip
meta-impy-8fa1dc90a9fec493b19604a4b4e08dc3208c7e8f.tar.gz
meta-impy-8fa1dc90a9fec493b19604a4b4e08dc3208c7e8f.tar.bz2
meta-impy-8fa1dc90a9fec493b19604a4b4e08dc3208c7e8f.tar.xz
Unbranding. Todays word is "linden".
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 7b1ed95..3800b4d 100644
--- a/linden/indra/newview/llvoiceclient.cpp
+++ b/linden/indra/newview/llvoiceclient.cpp
@@ -4668,11 +4668,11 @@ void LLVoiceClient::messageEvent(
4668 { 4668 {
4669 bool is_busy = gAgent.getBusy(); 4669 bool is_busy = gAgent.getBusy();
4670 bool is_muted = LLMuteList::getInstance()->isMuted(session->mCallerID, session->mName, LLMute::flagTextChat); 4670 bool is_muted = LLMuteList::getInstance()->isMuted(session->mCallerID, session->mName, LLMute::flagTextChat);
4671 bool is_linden = LLMuteList::getInstance()->isLinden(session->mName); 4671 bool is_god = LLMuteList::getInstance()->isGod(session->mName);
4672 bool quiet_chat = false; 4672 bool quiet_chat = false;
4673 LLChat chat; 4673 LLChat chat;
4674 4674
4675 chat.mMuted = is_muted && !is_linden; 4675 chat.mMuted = is_muted && !is_god;
4676 4676
4677 if(!chat.mMuted) 4677 if(!chat.mMuted)
4678 { 4678 {
@@ -4680,7 +4680,7 @@ void LLVoiceClient::messageEvent(
4680 chat.mFromName = session->mName; 4680 chat.mFromName = session->mName;
4681 chat.mSourceType = CHAT_SOURCE_AGENT; 4681 chat.mSourceType = CHAT_SOURCE_AGENT;
4682 4682
4683 if(is_busy && !is_linden) 4683 if(is_busy && !is_god)
4684 { 4684 {
4685 quiet_chat = true; 4685 quiet_chat = true;
4686 // TODO: Question: Return busy mode response here? Or maybe when session is started instead? 4686 // TODO: Question: Return busy mode response here? Or maybe when session is started instead?