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

Merge commit '116fbe8258e336be3f6ac1e11119214629799faa' into bigmerge

Browse Source 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
This commit is contained in:
Melanie
2011-10-25 03:06:18 +01:00
parent 89e973805d 116fbe8258
commit 1ec82bb000
3 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,7 +96,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
private bool m_startedFromSavedState;
private UUID m_CurrentStateHash;
private UUID m_RegionID;
private bool m_Suspended = false;
private Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>>
m_LineMap;
@@ -140,6 +139,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
set { m_RunEvents = value; }
}
public bool Suspended { get; set; }
public bool ShuttingDown
{
get { return m_ShuttingDown; }
@@ -651,7 +652,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
lock (m_EventQueue)
{
if (m_Suspended)
if (Suspended)
return 0;
lock (m_Script)
@@ -1030,12 +1031,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
public void Suspend()
{
m_Suspended = true;
Suspended = true;
}
public void Resume()
{
m_Suspended = false;
Suspended = false;
}
}
}