diff options
author | Tedd Hansen | 2007-08-17 21:24:38 +0000 |
---|---|---|
committer | Tedd Hansen | 2007-08-17 21:24:38 +0000 |
commit | fcf7db72728174a628e62ae9d98a3c0090217728 (patch) | |
tree | 2eb9138fd0c0cfb46aa44c74cb8cda75fce40f92 /OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs | |
parent | Removed RAIL test from startup for now... (diff) | |
download | opensim-SC_OLD-fcf7db72728174a628e62ae9d98a3c0090217728.zip opensim-SC_OLD-fcf7db72728174a628e62ae9d98a3c0090217728.tar.gz opensim-SC_OLD-fcf7db72728174a628e62ae9d98a3c0090217728.tar.bz2 opensim-SC_OLD-fcf7db72728174a628e62ae9d98a3c0090217728.tar.xz |
Pimped up Default.lsl. Now featuring a touch counter.
Changed "ObjectID" in ScriptEngine to IScriptHost reference. Events will now be queued based on IScriptHost reference instead of string ID of object. Removed "root" object reference in script.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs index 7b35b5d..d21855b 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs | |||
@@ -30,6 +30,8 @@ using System; | |||
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Text; | 31 | using System.Text; |
32 | using OpenSim.Framework.Console; | 32 | using OpenSim.Framework.Console; |
33 | //using OpenSim.Region.Environment.Scenes; | ||
34 | using OpenSim.Region.Environment.Scenes.Scripting; | ||
33 | 35 | ||
34 | namespace OpenSim.Region.ScriptEngine.DotNetEngine | 36 | namespace OpenSim.Region.ScriptEngine.DotNetEngine |
35 | { | 37 | { |
@@ -80,8 +82,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
80 | 82 | ||
81 | // !!!FOR DEBUGGING ONLY!!! (for executing script directly from test app) | 83 | // !!!FOR DEBUGGING ONLY!!! (for executing script directly from test app) |
82 | [Obsolete("!!!FOR DEBUGGING ONLY!!!")] | 84 | [Obsolete("!!!FOR DEBUGGING ONLY!!!")] |
83 | public void StartScript(string ScriptID, string ObjectID) | 85 | public void StartScript(string ScriptID, IScriptHost ObjectID) |
84 | { | 86 | { |
87 | this.myEventManager.TEMP_OBJECT_ID = ObjectID; | ||
85 | Log.Status("ScriptEngine", "DEBUG FUNCTION: StartScript: " + ScriptID); | 88 | Log.Status("ScriptEngine", "DEBUG FUNCTION: StartScript: " + ScriptID); |
86 | myScriptManager.StartScript(ScriptID, ObjectID); | 89 | myScriptManager.StartScript(ScriptID, ObjectID); |
87 | } | 90 | } |