When the user stops a script, have it remain stopped

Previously the script state was never saved for a !Running script, so upon region restart the script would be Running again.

The use of the 'StayStopped' flag is needed because all scripts are automatically stopped when the region shuts down, but in that case we shouldn't save in their state that they're !Running.
0.8.2-post-fixes
Oren Hurvitz 2015-08-07 16:35:32 +03:00
parent a568f06b7f
commit 59da146e9d
3 changed files with 28 additions and 3 deletions

View File

@ -92,6 +92,11 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
/// </summary>
bool ShuttingDown { get; set; }
/// <summary>
/// When stopping the script: should it remain stopped permanently (i.e., save !Running in its state)?
/// </summary>
bool StayStopped { get; set; }
/// <summary>
/// Script state
/// </summary>

View File

@ -126,7 +126,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
}
}
public bool Running { get; set; }
public bool Running
{
get { return m_running; }
set
{
m_running = value;
if (m_running)
StayStopped = false;
}
}
private bool m_running;
public bool Suspended
{
@ -158,6 +169,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
public string State { get; set; }
public bool StayStopped { get; set; }
public IScriptEngine Engine { get; private set; }
public UUID AppDomain { get; set; }
@ -1077,7 +1090,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
public void SaveState()
{
if (!Running)
if (!Running && !StayStopped)
return;
// We cannot call this inside the EventQueue lock since it will currently take AsyncCommandManager.staticLock.
@ -1089,7 +1102,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
lock (EventQueue)
{
// Check again to avoid a race with a thread in Stop()
if (!Running)
if (!Running && !StayStopped)
return;
// If we're currently in an event, just tell it to save upon return
@ -1130,6 +1143,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
//}
m_CurrentStateHash = hash;
}
StayStopped = false;
}
}

View File

@ -699,6 +699,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
{
if (instance.Running)
{
instance.StayStopped = true; // the script was stopped explicitly
instance.Stop(0);
SceneObjectPart sop = m_Scene.GetSceneObjectPart(instance.ObjectID);
@ -1914,6 +1916,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
if (instance != null)
{
lock (instance.EventQueue)
instance.StayStopped = true; // the script was stopped explicitly
instance.Stop(m_WaitForEventCompletionOnScriptStop);
}
else