ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-02 06:44:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	ThirdParty/SmartThreadPool/SmartThreadPool.cs
This commit is contained in:
Melanie
2013-05-01 21:39:49 +01:00
parent b89d18e6f4 c6d50cd431
commit 8c5445b774
37 changed files with 6745 additions and 4828 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
View File

@@ -572,9 +572,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
public bool Stop(int timeout)
{
// m_log.DebugFormat(
// "[SCRIPT INSTANCE]: Stopping script {0} {1} in {2} {3} with timeout {4} {5} {6}",
// ScriptName, ItemID, PrimName, ObjectID, timeout, m_InSelfDelete, DateTime.Now.Ticks);
if (DebugLevel >= 1)
m_log.DebugFormat(
"[SCRIPT INSTANCE]: Stopping script {0} {1} in {2} {3} with timeout {4} {5} {6}",
ScriptName, ItemID, PrimName, ObjectID, timeout, m_InSelfDelete, DateTime.Now.Ticks);
IScriptWorkItem workItem;