Merge branch 'master' into careminster

Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2026-08-01 06:06:06 +08:00 · 2013-01-02 11:52:37 +00:00
parent 7e98dfd70b aa236b2020
commit 7943c8d11c
40 changed files with 4620 additions and 1955 deletions
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -1576,6 +1576,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
            startInfo.StartSuspended = true;

            m_ThreadPool = new SmartThreadPool(startInfo);
+            m_ThreadPool.Name = "XEngine";
        }

        //