diff options
| author | Melanie | 2013-01-02 11:52:37 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-02 11:52:37 +0000 |
| commit | 7943c8d11cbcac3ab16fb347d0c4116adc6437a5 (patch) | |
| tree | a8f099569905001bdedf144a77fd7b9191aa6427 /OpenSim/Region/ScriptEngine/XEngine | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | BulletSim: add parameter to have Bullet output performance statistics (diff) | |
| download | opensim-SC-7943c8d11cbcac3ab16fb347d0c4116adc6437a5.zip opensim-SC-7943c8d11cbcac3ab16fb347d0c4116adc6437a5.tar.gz opensim-SC-7943c8d11cbcac3ab16fb347d0c4116adc6437a5.tar.bz2 opensim-SC-7943c8d11cbcac3ab16fb347d0c4116adc6437a5.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 0bd9a06..05dd7ab 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
| @@ -1576,6 +1576,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
| 1576 | startInfo.StartSuspended = true; | 1576 | startInfo.StartSuspended = true; |
| 1577 | 1577 | ||
| 1578 | m_ThreadPool = new SmartThreadPool(startInfo); | 1578 | m_ThreadPool = new SmartThreadPool(startInfo); |
| 1579 | m_ThreadPool.Name = "XEngine"; | ||
| 1579 | } | 1580 | } |
| 1580 | 1581 | ||
| 1581 | // | 1582 | // |