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/Compiler | |
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/Compiler')
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs index d15701c..7370c6e 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs | |||
@@ -232,8 +232,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL | |||
232 | Return += @" | 232 | Return += @" |
233 | public Script( | 233 | public Script( |
234 | OpenSim.Region.ScriptEngine.DotNetEngine.ScriptManager manager, | 234 | OpenSim.Region.ScriptEngine.DotNetEngine.ScriptManager manager, |
235 | OpenSim.Region.Environment.Scenes.Scripting.IScriptHost host, | 235 | OpenSim.Region.Environment.Scenes.Scripting.IScriptHost host ) : base( manager, host ) { }"+"\r\n"; |
236 | OpenSim.Region.Environment.Scenes.Scripting.IScriptHost root ) : base( manager, host, root ) { }"+"\r\n"; | ||
237 | Return += Script; | 236 | Return += Script; |
238 | Return += "} }\r\n"; | 237 | Return += "} }\r\n"; |
239 | 238 | ||
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs index 7c605c2..486332f 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs | |||
@@ -16,13 +16,11 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL | |||
16 | 16 | ||
17 | protected ScriptManager m_manager; | 17 | protected ScriptManager m_manager; |
18 | protected IScriptHost m_host; | 18 | protected IScriptHost m_host; |
19 | protected IScriptHost m_root; | ||
20 | 19 | ||
21 | public LSL_BaseClass(ScriptManager manager, IScriptHost host, IScriptHost root) | 20 | public LSL_BaseClass(ScriptManager manager, IScriptHost host) |
22 | { | 21 | { |
23 | m_manager = manager; | 22 | m_manager = manager; |
24 | m_host = host; | 23 | m_host = host; |
25 | m_root = root; | ||
26 | } | 24 | } |
27 | 25 | ||
28 | public Scene World | 26 | public Scene World |