SNOW-683 VWR-8726 : Turn off swirling lights for scripted objects

doc/contributions.txt

@@ -662,6 +662,8 @@ Tue Torok
 	CT-74
 Vadim Bigbear
 	VWR-2681
+Vector Hastings
+	VWR-8726
 Vixen Heron
 	VWR-2710
 	CT-88

indra/newview/app_settings/settings.xml

@@ -2787,6 +2787,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>EffectScriptChatParticles</key>
+      <map>
+      <key>Comment</key>
+      <string>1 = normal behavior, 0 = disable display of swirling lights when scripts communicate</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>EnableRippleWater</key>
     <map>
       <key>Comment</key>

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);