diff options
author | Tedd Hansen | 2008-01-05 15:48:02 +0000 |
---|---|---|
committer | Tedd Hansen | 2008-01-05 15:48:02 +0000 |
commit | 966f639ad6c83828d8e60ef9103ad61c360f9c3b (patch) | |
tree | 020ff9c0666d8e8980c920afd77e34660fc121f3 /OpenSim/Grid | |
parent | Added errorhandler+tip that grid server might not be running on grid registra... (diff) | |
download | opensim-SC-966f639ad6c83828d8e60ef9103ad61c360f9c3b.zip opensim-SC-966f639ad6c83828d8e60ef9103ad61c360f9c3b.tar.gz opensim-SC-966f639ad6c83828d8e60ef9103ad61c360f9c3b.tar.bz2 opensim-SC-966f639ad6c83828d8e60ef9103ad61c360f9c3b.tar.xz |
Changes to ScriptServer to (hopefully) make it compile on both .Net and Mono.
Some debug info for startup added to find bugs. ++
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r-- | OpenSim/Grid/ScriptServer/RemotingObject.cs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Grid/ScriptServer/RemotingObject.cs b/OpenSim/Grid/ScriptServer/RemotingObject.cs index 2d5936e..915d020 100644 --- a/OpenSim/Grid/ScriptServer/RemotingObject.cs +++ b/OpenSim/Grid/ScriptServer/RemotingObject.cs | |||
@@ -2,26 +2,26 @@ | |||
2 | using System.Collections.Generic; | 2 | using System.Collections.Generic; |
3 | using System.Text; | 3 | using System.Text; |
4 | using OpenSim.Region.Environment.Interfaces; | 4 | using OpenSim.Region.Environment.Interfaces; |
5 | using OpenSim.Region.ScriptEngine.DotNetEngine; | 5 | using OpenSim.Region.ScriptEngine.Common; |
6 | 6 | ||
7 | namespace OpenSim.Grid.ScriptServer | 7 | namespace OpenSim.Grid.ScriptServer |
8 | { | 8 | { |
9 | public class RemotingObject : MarshalByRefObject | 9 | public class RemotingObject : MarshalByRefObject, ScriptServerInterfaces.ServerRemotingObject |
10 | { | 10 | { |
11 | // This object will be exposed over remoting. It is a singleton, so it exists only in as one instance. | 11 | // This object will be exposed over remoting. It is a singleton, so it exists only in as one instance. |
12 | 12 | ||
13 | // Expose ScriptEngine directly for now ... this is not very secure :) | 13 | // Expose ScriptEngine directly for now ... this is not very secure :) |
14 | // NOTE! CURRENTLY JUST HARDWIRED DOTNETENGINE! | 14 | // NOTE! CURRENTLY JUST HARDWIRED DOTNETENGINE! |
15 | public OpenSim.Region.ScriptEngine.DotNetEngine.ScriptEngine ScriptEngine = new OpenSim.Region.ScriptEngine.DotNetEngine.ScriptEngine(); | 15 | //private OpenSim.Region.ScriptEngine.DotNetEngine.ScriptEngine SE = |
16 | // new OpenSim.Region.ScriptEngine.DotNetEngine.ScriptEngine(); | ||
17 | //public OpenSim.Region.ScriptEngine.Common.ScriptServerInterfaces.RemoteEvents Events = | ||
18 | // (OpenSim.Region.ScriptEngine.Common.ScriptServerInterfaces.RemoteEvents)SE.m_EventManager; | ||
16 | 19 | ||
20 | //private ScriptServerInterfaces.RemoteEvents _events = new abc; | ||
17 | 21 | ||
18 | /// <summary> | 22 | ScriptServerInterfaces.RemoteEvents ScriptServerInterfaces.ServerRemotingObject.Events() |
19 | /// Receives calls from remote grids. | ||
20 | /// </summary> | ||
21 | /// <returns></returns> | ||
22 | public OpenSim.Region.ScriptEngine.DotNetEngine.ScriptEngine GetScriptEngine() | ||
23 | { | 23 | { |
24 | return ScriptEngine; | 24 | return null; |
25 | } | 25 | } |
26 | } | 26 | } |
27 | } | 27 | } |