Merge branch 'main' of git.alchemyviewer.org:alchemy/alchemy-next

indra/llui/lltextbox.h

@@ -79,6 +79,12 @@ class LLTextBox :
 	LLUIString			mText;
 	callback_t			mClickedCallback;
 	bool				mShowCursorHand;
+
+protected:
+	virtual std::string _getSearchText() const
+	{
+		return LLTextBase::_getSearchText() + mText.getString();
+	}
 };
 
 // Build time optimization, generate once in .cpp file

indra/newview/skins/default/xui/en/panel_preferences_interface.xml

@@ -232,4 +232,28 @@
          value="3"
          width="90" />
     </radio_group>
+    <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="10"
+    layout="topleft"
+    left="30"
+    name="World Effects"
+    mouse_opaque="false"
+    top_pad="5"
+    width="300">
+    World Effects:
+ </text>
+     <check_box
+      follows="left|top"
+      height="16"
+		  label="Create particle effects when scripts communicate"
+	  	layout="topleft"
+  		tool_tip="If enabled scripted objects display swirling particle lights when the scripts communicate"
+      left="45"
+      top_pad="7"
+      name="EffectScriptChatParticles"
+      width="275"
+      control_name="EffectScriptChatParticles"/>
 </panel>