OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'ea7366ddc6f0e13519589fcaa3729fd36b5eef79' into bigmerge 

Conflicts:
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
avinationmerge
Melanie 2011-10-25 01:36:39 +01:00
parent 0b833c458a ea7366ddc6
commit 8e69dde397
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -684,7 +684,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
lock(m_Script) lock(m_Script)
{ {
//m_log.DebugFormat("[XENGINE]: Processing event {0} for {1}", data.EventName, this); //m_log.DebugFormat("[XEngine]: Processing event {0} for {1}", data.EventName, this);
m_DetectParams = data.DetectParams; m_DetectParams = data.DetectParams;

2
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
View File

@ -1083,7 +1083,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
IScriptInstance instance = (ScriptInstance) parms; IScriptInstance instance = (ScriptInstance) parms;
//m_log.DebugFormat("[XENGINE]: Processing event for {0}", instance); //m_log.DebugFormat("[XEngine]: Processing event for {0}", instance);
return instance.EventProcessor(); return instance.EventProcessor();
} }