aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Common
diff options
context:
space:
mode:
authorTedd Hansen2008-01-12 10:25:08 +0000
committerTedd Hansen2008-01-12 10:25:08 +0000
commita993d0d3351f15510e404cc09951723cf5c435fb (patch)
treeb4e186b85fc5b1907dffb1347d8b855a4ea7a0ad /OpenSim/Region/ScriptEngine/Common
parentScriptServer protocol now correctly casts datatypes -- ready for implementing (diff)
downloadopensim-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.cs3
-rw-r--r--OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs7
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 @@
1using libsecondlife; 1using libsecondlife;
2using OpenSim.Framework; 2using OpenSim.Framework;
3using OpenSim.Framework.Console;
4using OpenSim.Region.Environment.Scenes;
3 5
4namespace OpenSim.Region.ScriptEngine.Common 6namespace 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 @@
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Diagnostics; 3using System.Diagnostics;
4using System.Text; 4using System.Text;
5using libsecondlife;
5using OpenSim.Region.ScriptEngine.Common.TRPC; 6using OpenSim.Region.ScriptEngine.Common.TRPC;
6 7
7namespace OpenSim.Region.ScriptEngine.Common 8namespace 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