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/Common | |
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/Common')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs b/OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs index 14b97b8..23ef126 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs | |||
@@ -1,5 +1,7 @@ | |||
1 | using libsecondlife; | 1 | using libsecondlife; |
2 | using OpenSim.Framework; | 2 | using OpenSim.Framework; |
3 | using OpenSim.Framework.Console; | ||
4 | using OpenSim.Region.Environment.Scenes; | ||
3 | 5 | ||
4 | namespace OpenSim.Region.ScriptEngine.Common | 6 | namespace OpenSim.Region.ScriptEngine.Common |
5 | { | 7 | { |
@@ -50,6 +52,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
50 | public interface ScriptEngine | 52 | public interface ScriptEngine |
51 | { | 53 | { |
52 | RemoteEvents EventManager(); | 54 | RemoteEvents EventManager(); |
55 | void InitializeEngine(Scene Sceneworld, LogBase logger, bool DontHookUp); | ||
53 | } | 56 | } |
54 | 57 | ||
55 | } | 58 | } |
diff --git a/OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs b/OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs index b6c2e93..10abc35 100644 --- a/OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs +++ b/OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs | |||
@@ -2,6 +2,7 @@ | |||
2 | using System.Collections.Generic; | 2 | using System.Collections.Generic; |
3 | using System.Diagnostics; | 3 | using System.Diagnostics; |
4 | using System.Text; | 4 | using System.Text; |
5 | using libsecondlife; | ||
5 | using OpenSim.Region.ScriptEngine.Common.TRPC; | 6 | using OpenSim.Region.ScriptEngine.Common.TRPC; |
6 | 7 | ||
7 | namespace OpenSim.Region.ScriptEngine.Common | 8 | namespace OpenSim.Region.ScriptEngine.Common |
@@ -22,7 +23,11 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
22 | typeof(System.Int64), | 23 | typeof(System.Int64), |
23 | typeof(System.Double), | 24 | typeof(System.Double), |
24 | typeof(System.Decimal), | 25 | typeof(System.Decimal), |
25 | typeof(System.Array) | 26 | typeof(System.Array), |
27 | typeof(LLUUID), | ||
28 | typeof(System.UInt16), | ||
29 | typeof(System.UInt32), | ||
30 | typeof(System.UInt64) | ||
26 | }; | 31 | }; |
27 | 32 | ||
28 | // TODO: Maybe we should move queue into TCPSocket so we won't have to keep one queue instance per connection | 33 | // TODO: Maybe we should move queue into TCPSocket so we won't have to keep one queue instance per connection |