summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2010-08-31 21:11:28 -0700
committerMerov Linden <merov@lindenlab.com>2010-08-31 21:11:28 -0700
commitbe07498847a4493792ebc943308c3592399d643d (patch)
treee5720f8efca5bb9138a92e540b1228b2097622c9 /indra/newview/llviewermessage.cpp
parent97d52e2a3e3e4ac4ac9290e0541fb2a6ab1ecfbd (diff)
SNOW-683 VWR-8726 : Turn off swirling lights for scripted objects
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rw-r--r--indra/newview/llviewermessage.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 82bc084f68..781e324e25 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -2964,7 +2964,8 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
// Make swirly things only for talking objects. (not script debug messages, though)
if (chat.mSourceType == CHAT_SOURCE_OBJECT
- && chat.mChatType != CHAT_TYPE_DEBUG_MSG)
+ && chat.mChatType != CHAT_TYPE_DEBUG_MSG
+ && gSavedSettings.getBOOL("EffectScriptChatParticles") )
{
LLPointer<LLViewerPartSourceChat> psc = new LLViewerPartSourceChat(chatter->getPositionAgent());
psc->setSourceObject(chatter);