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/Environment/Scenes/Scripting | |
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/Environment/Scenes/Scripting')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs b/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs index 03587de..62c84a6 100644 --- a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs +++ b/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs | |||
@@ -7,6 +7,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting | |||
7 | { | 7 | { |
8 | public class NullScriptHost : IScriptHost | 8 | public class NullScriptHost : IScriptHost |
9 | { | 9 | { |
10 | |||
10 | LLVector3 m_pos = new LLVector3( 128, 128, 30 ); | 11 | LLVector3 m_pos = new LLVector3( 128, 128, 30 ); |
11 | public string Name | 12 | public string Name |
12 | { | 13 | { |
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs index 510f257..33021ee 100644 --- a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs +++ b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs | |||
@@ -29,6 +29,8 @@ | |||
29 | using System; | 29 | using System; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Text; | 31 | using System.Text; |
32 | using OpenSim.Region.Environment.Scenes.Scripting; | ||
33 | |||
32 | //TODO: WHERE TO PLACE THIS? | 34 | //TODO: WHERE TO PLACE THIS? |
33 | namespace OpenSim.Region.Environment.Scenes.Scripting | 35 | namespace OpenSim.Region.Environment.Scenes.Scripting |
34 | { | 36 | { |
@@ -36,6 +38,6 @@ namespace OpenSim.Region.Environment.Scenes.Scripting | |||
36 | { | 38 | { |
37 | void InitializeEngine(OpenSim.Region.Environment.Scenes.Scene Sceneworld, OpenSim.Framework.Console.LogBase logger); | 39 | void InitializeEngine(OpenSim.Region.Environment.Scenes.Scene Sceneworld, OpenSim.Framework.Console.LogBase logger); |
38 | void Shutdown(); | 40 | void Shutdown(); |
39 | void StartScript(string ScriptID, string ObjectID); | 41 | void StartScript(string ScriptID, IScriptHost ObjectID); |
40 | } | 42 | } |
41 | } | 43 | } |