diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-02 11:27:52 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-02 11:27:52 +0100 |
| commit | 63f2ddf377fa0fc6a666cdc1001289335d86258b (patch) | |
| tree | ace7455bb907429aa992a593b4b0dc3704be8914 /indra/newview/llviewermessage.cpp | |
| parent | ae115d1a89bc425aee478bd31a66827a6f49fd8a (diff) | |
| parent | 39e6447d98a36eb196f9ed6a3b06f0390f1ed084 (diff) | |
merge for VWR-1852 VWR-8726 VWR-4232 VWR-22752
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 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); |