diff options
author | Tedd Hansen | 2008-01-12 10:25:08 +0000 |
---|---|---|
committer | Tedd Hansen | 2008-01-12 10:25:08 +0000 |
commit | a993d0d3351f15510e404cc09951723cf5c435fb (patch) | |
tree | b4e186b85fc5b1907dffb1347d8b855a4ea7a0ad /OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs | |
parent | ScriptServer protocol now correctly casts datatypes -- ready for implementing (diff) | |
download | opensim-SC-a993d0d3351f15510e404cc09951723cf5c435fb.zip opensim-SC-a993d0d3351f15510e404cc09951723cf5c435fb.tar.gz opensim-SC-a993d0d3351f15510e404cc09951723cf5c435fb.tar.bz2 opensim-SC-a993d0d3351f15510e404cc09951723cf5c435fb.tar.xz |
ScriptServer communication is ok. Script is creatd on onrez. But since it can not access Scene it sort of crashes right away ;)
Added some sample placeholders for implementing rest of LSL events.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs index 604a5f3..c3cb34d 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs | |||
@@ -62,7 +62,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
62 | get { return m_log; } | 62 | get { return m_log; } |
63 | } | 63 | } |
64 | 64 | ||
65 | public void InitializeEngine(Scene Sceneworld, LogBase logger) | 65 | public void InitializeEngine(Scene Sceneworld, LogBase logger, bool HookUpToServer) |
66 | { | 66 | { |
67 | World = Sceneworld; | 67 | World = Sceneworld; |
68 | m_log = logger; | 68 | m_log = logger; |
@@ -73,7 +73,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
73 | 73 | ||
74 | // Create all objects we'll be using | 74 | // Create all objects we'll be using |
75 | m_EventQueueManager = new EventQueueManager(this); | 75 | m_EventQueueManager = new EventQueueManager(this); |
76 | m_EventManager = new EventManager(this); | 76 | m_EventManager = new EventManager(this, HookUpToServer); |
77 | m_ScriptManager = new ScriptManager(this); | 77 | m_ScriptManager = new ScriptManager(this); |
78 | m_AppDomainManager = new AppDomainManager(); | 78 | m_AppDomainManager = new AppDomainManager(); |
79 | m_LSLLongCmdHandler = new LSLLongCmdHandler(this); | 79 | m_LSLLongCmdHandler = new LSLLongCmdHandler(this); |
@@ -97,7 +97,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
97 | 97 | ||
98 | public void Initialise(Scene scene, IConfigSource config) | 98 | public void Initialise(Scene scene, IConfigSource config) |
99 | { | 99 | { |
100 | InitializeEngine(scene, MainLog.Instance); | 100 | InitializeEngine(scene, MainLog.Instance, true); |
101 | } | 101 | } |
102 | 102 | ||
103 | public void PostInitialise() | 103 | public void PostInitialise() |