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

Merge commit '3cf7fb4eca2ad57835311e8098868f2571709392' into bigmerge

Browse Source 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
This commit is contained in:
Melanie
2011-10-25 03:10:54 +01:00
parent 1bb0e3c800 3cf7fb4eca
commit df430d572d
2 changed files with 52 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -650,11 +650,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
{
EventParams data = null;
if (Suspended)
return 0;
lock (m_EventQueue)
{
if (Suspended)
return 0;
lock (m_Script)
{
data = (EventParams) m_EventQueue.Dequeue();
@@ -685,7 +685,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
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;