diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-09-09 10:40:25 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-09-09 10:40:25 -0700 |
| commit | 81ea8d1751a8866b9ec998542c7d6e9b5645f357 (patch) | |
| tree | 1f7f45a9bcf469efe9fc30c68aee2638342c1557 /indra/newview/llviewermessage.cpp | |
| parent | f2d61c7371171e0ee1329186116c585aa5de7f52 (diff) | |
| parent | 72e597a6f9e6dacbb41383ee8ee29e55acff4b74 (diff) | |
Pull from lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 85759319a6..6d0cbbf8f2 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -3009,7 +3009,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); |