aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
authorMelanie Thielker2009-04-15 18:51:17 +0000
committerMelanie Thielker2009-04-15 18:51:17 +0000
commit3c338e4e563509e480d5eab71134126d1d7aadf5 (patch)
tree8a6c038d859f41a97d857770dc626d38d8a8cd3a /OpenSim/Region/ScriptEngine/Shared
parent* Resolve unit test failure introduced in r9148 (probably) (diff)
downloadopensim-SC_OLD-3c338e4e563509e480d5eab71134126d1d7aadf5.zip
opensim-SC_OLD-3c338e4e563509e480d5eab71134126d1d7aadf5.tar.gz
opensim-SC_OLD-3c338e4e563509e480d5eab71134126d1d7aadf5.tar.bz2
opensim-SC_OLD-3c338e4e563509e480d5eab71134126d1d7aadf5.tar.xz
Convert both script engines to new region module format. Add proper unload
handling to XEngine. Add needed stubs to DotNetEngine.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs7
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs3
2 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 1c865e8..8e3d026 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -93,6 +93,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
93 private bool m_postOnRez; 93 private bool m_postOnRez;
94 private bool m_startedFromSavedState = false; 94 private bool m_startedFromSavedState = false;
95 private string m_CurrentState = String.Empty; 95 private string m_CurrentState = String.Empty;
96 private UUID m_RegionID = UUID.Zero;
96 97
97 //private ISponsor m_ScriptSponsor; 98 //private ISponsor m_ScriptSponsor;
98 private Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> 99 private Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>>
@@ -231,6 +232,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
231 m_MaxScriptQueue = maxScriptQueue; 232 m_MaxScriptQueue = maxScriptQueue;
232 m_stateSource = stateSource; 233 m_stateSource = stateSource;
233 m_postOnRez = postOnRez; 234 m_postOnRez = postOnRez;
235 m_RegionID = part.ParentGroup.Scene.RegionInfo.RegionID;
234 236
235 if (part != null) 237 if (part != null)
236 { 238 {
@@ -980,5 +982,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
980 982
981 return ScriptSerializer.Serialize(this); 983 return ScriptSerializer.Serialize(this);
982 } 984 }
985
986 public UUID RegionID
987 {
988 get { return m_RegionID; }
989 }
983 } 990 }
984} 991}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
index cf98cf1..9fe48df 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
@@ -60,7 +60,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
60 SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene); 60 SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene);
61 61
62 XEngine.XEngine engine = new XEngine.XEngine(); 62 XEngine.XEngine engine = new XEngine.XEngine();
63 engine.Initialise(scene, initConfigSource); 63 engine.Initialise(initConfigSource);
64 engine.AddRegion(scene);
64 65
65 m_lslApi = new LSL_Api(); 66 m_lslApi = new LSL_Api();
66 m_lslApi.Initialize(engine, part, part.LocalId, part.UUID); 67 m_lslApi.Initialize(engine, part, part.LocalId, part.UUID);