mirror of
https://github.com/opensim/opensim.git
synced 2026-08-05 17:05:55 +08:00
Convert both script engines to new region module format. Add proper unload
handling to XEngine. Add needed stubs to DotNetEngine.
This commit is contained in:
@@ -93,6 +93,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
|
||||
private bool m_postOnRez;
|
||||
private bool m_startedFromSavedState = false;
|
||||
private string m_CurrentState = String.Empty;
|
||||
private UUID m_RegionID = UUID.Zero;
|
||||
|
||||
//private ISponsor m_ScriptSponsor;
|
||||
private Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>>
|
||||
@@ -231,6 +232,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
|
||||
m_MaxScriptQueue = maxScriptQueue;
|
||||
m_stateSource = stateSource;
|
||||
m_postOnRez = postOnRez;
|
||||
m_RegionID = part.ParentGroup.Scene.RegionInfo.RegionID;
|
||||
|
||||
if (part != null)
|
||||
{
|
||||
@@ -980,5 +982,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
|
||||
|
||||
return ScriptSerializer.Serialize(this);
|
||||
}
|
||||
|
||||
public UUID RegionID
|
||||
{
|
||||
get { return m_RegionID; }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -60,7 +60,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
|
||||
SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene);
|
||||
|
||||
XEngine.XEngine engine = new XEngine.XEngine();
|
||||
engine.Initialise(scene, initConfigSource);
|
||||
engine.Initialise(initConfigSource);
|
||||
engine.AddRegion(scene);
|
||||
|
||||
m_lslApi = new LSL_Api();
|
||||
m_lslApi.Initialize(engine, part, part.LocalId, part.UUID);
|
||||
|
||||
Reference in New Issue
Block a user