diff options
* Now sending manager, host and root host to Script in constructor.
* Changed how Script accesses World
* Implemented llSay, llWhisper and llShout
* Added SetText() to IScriptHost, implemented llText
* Minor renamings to conform with code conventions
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs index f7947f7..7b35b5d 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs | |||
@@ -29,6 +29,7 @@ | |||
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.Framework.Console; | ||
32 | 33 | ||
33 | namespace OpenSim.Region.ScriptEngine.DotNetEngine | 34 | namespace OpenSim.Region.ScriptEngine.DotNetEngine |
34 | { | 35 | { |
@@ -42,7 +43,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
42 | internal EventManager myEventManager; // Handles and queues incoming events from OpenSim | 43 | internal EventManager myEventManager; // Handles and queues incoming events from OpenSim |
43 | internal EventQueueManager myEventQueueManager; // Executes events | 44 | internal EventQueueManager myEventQueueManager; // Executes events |
44 | internal ScriptManager myScriptManager; // Load, unload and execute scripts | 45 | internal ScriptManager myScriptManager; // Load, unload and execute scripts |
45 | internal OpenSim.Framework.Console.LogBase m_logger; | 46 | |
47 | private OpenSim.Framework.Console.LogBase m_log; | ||
46 | 48 | ||
47 | public ScriptEngine() | 49 | public ScriptEngine() |
48 | { | 50 | { |
@@ -50,10 +52,15 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
50 | Common.mySE = this; | 52 | Common.mySE = this; |
51 | } | 53 | } |
52 | 54 | ||
55 | public LogBase Log | ||
56 | { | ||
57 | get { return m_log; } | ||
58 | } | ||
59 | |||
53 | public void InitializeEngine(OpenSim.Region.Environment.Scenes.Scene Sceneworld, OpenSim.Framework.Console.LogBase logger) | 60 | public void InitializeEngine(OpenSim.Region.Environment.Scenes.Scene Sceneworld, OpenSim.Framework.Console.LogBase logger) |
54 | { | 61 | { |
55 | World = Sceneworld; | 62 | World = Sceneworld; |
56 | m_logger = logger; | 63 | m_log = logger; |
57 | 64 | ||
58 | //m_logger.Status("ScriptEngine", "InitializeEngine"); | 65 | //m_logger.Status("ScriptEngine", "InitializeEngine"); |
59 | 66 | ||
@@ -75,7 +82,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
75 | [Obsolete("!!!FOR DEBUGGING ONLY!!!")] | 82 | [Obsolete("!!!FOR DEBUGGING ONLY!!!")] |
76 | public void StartScript(string ScriptID, string ObjectID) | 83 | public void StartScript(string ScriptID, string ObjectID) |
77 | { | 84 | { |
78 | m_logger.Status("ScriptEngine", "DEBUG FUNCTION: StartScript: " + ScriptID); | 85 | Log.Status("ScriptEngine", "DEBUG FUNCTION: StartScript: " + ScriptID); |
79 | myScriptManager.StartScript(ScriptID, ObjectID); | 86 | myScriptManager.StartScript(ScriptID, ObjectID); |
80 | } | 87 | } |
81 | } | 88 | } |