diff options
| author | Melanie | 2012-03-14 11:33:51 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-14 11:33:51 +0000 |
| commit | c0f70d17fcd93751a8849f7ad1c5a76e5a3d135d (patch) | |
| tree | 4b2972bdee4a29c4ecfce11bee9f154c7cdd9873 /OpenSim/Region/ScriptEngine/XEngine | |
| parent | Implement llSetPrimitiveParams for physics shape and material. Add (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-c0f70d17fcd93751a8849f7ad1c5a76e5a3d135d.zip opensim-SC-c0f70d17fcd93751a8849f7ad1c5a76e5a3d135d.tar.gz opensim-SC-c0f70d17fcd93751a8849f7ad1c5a76e5a3d135d.tar.bz2 opensim-SC-c0f70d17fcd93751a8849f7ad1c5a76e5a3d135d.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index db6a407..1d3ba6c 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
| @@ -452,6 +452,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
| 452 | 452 | ||
| 453 | sb.AppendFormat("Unique scripts : {0}\n", m_uniqueScripts.Count); | 453 | sb.AppendFormat("Unique scripts : {0}\n", m_uniqueScripts.Count); |
| 454 | sb.AppendFormat("Scripts waiting for load : {0}\n", m_CompileQueue.Count); | 454 | sb.AppendFormat("Scripts waiting for load : {0}\n", m_CompileQueue.Count); |
| 455 | sb.AppendFormat("Max threads : {0}\n", m_ThreadPool.MaxThreads); | ||
| 456 | sb.AppendFormat("Min threads : {0}\n", m_ThreadPool.MinThreads); | ||
| 455 | sb.AppendFormat("Allocated threads : {0}\n", m_ThreadPool.ActiveThreads); | 457 | sb.AppendFormat("Allocated threads : {0}\n", m_ThreadPool.ActiveThreads); |
| 456 | sb.AppendFormat("In use threads : {0}\n", m_ThreadPool.InUseThreads); | 458 | sb.AppendFormat("In use threads : {0}\n", m_ThreadPool.InUseThreads); |
| 457 | sb.AppendFormat("Work items waiting : {0}\n", m_ThreadPool.WaitingCallbacks); | 459 | sb.AppendFormat("Work items waiting : {0}\n", m_ThreadPool.WaitingCallbacks); |