summaryrefslogtreecommitdiff
path: root/indra/newview/llagent.cpp
diff options
context:
space:
mode:
authorEric M. Tulla (BigPapi) <tulla@lindenlab.com>2009-11-17 17:58:17 -0500
committerEric M. Tulla (BigPapi) <tulla@lindenlab.com>2009-11-17 17:58:17 -0500
commit32178873564f86f0ab9ee06d485486fc9d609012 (patch)
tree4beae7908cbdd5e6af5241682110ac958b7c56ae /indra/newview/llagent.cpp
parent064fb26092ac9f73f9d0301f1e214e27e8418839 (diff)
parent2365dbcd459b37942ddacbcb7010232113a126c1 (diff)
Merge of viewer2 into avp
--HG-- branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llagent.cpp')
-rw-r--r--indra/newview/llagent.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index a093c1d434..7a540a45c4 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -42,6 +42,7 @@
#include "llanimationstates.h"
#include "llbottomtray.h"
#include "llcallingcard.h"
+#include "llchannelmanager.h"
#include "llconsole.h"
#include "llfirstuse.h"
#include "llfloatercamera.h"
@@ -2136,6 +2137,7 @@ void LLAgent::setBusy()
{
gBusyMenu->setLabel(LLTrans::getString("AvatarSetNotBusy"));
}
+ LLNotificationsUI::LLChannelManager::getInstance()->muteAllChannels(true);
}
//-----------------------------------------------------------------------------
@@ -2149,6 +2151,7 @@ void LLAgent::clearBusy()
{
gBusyMenu->setLabel(LLTrans::getString("AvatarSetBusy"));
}
+ LLNotificationsUI::LLChannelManager::getInstance()->muteAllChannels(false);
}
//-----------------------------------------------------------------------------