Merge branch 'AlericMaster' into V2Renderer

Conflicts:
	indra/llcommon/aithreadsafe.h
	indra/newview/pipeline.cpp

indra/newview/app_settings/settings.xml

@@ -1952,7 +1952,7 @@
     <key>PluginAttachDebuggerToPlugins</key>
     <map>
       <key>Comment</key>
-      <string>TODO: understand what this actually does -.-sg</string>
+      <string>Opens a terminal window with a debugger and attach it, every time a new SLPlugin process is started.</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -12067,6 +12067,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>StateMachineMaxTime</key>
+    <map>
+      <key>Comment</key>
+      <string>Maximum time per frame spent executing AIStateMachine objects, in miliseconds</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>U32</string>
+      <key>Value</key>
+      <integer>20</integer>
+    </map>
     <key>StatsAutoRun</key>
     <map>
       <key>Comment</key>