From 966f639ad6c83828d8e60ef9103ad61c360f9c3b Mon Sep 17 00:00:00 2001
From: Tedd Hansen
Date: Sat, 5 Jan 2008 15:48:02 +0000
Subject: Changes to ScriptServer to (hopefully) make it compile on both .Net
 and Mono. Some debug info for startup added to find bugs. ++

---
 OpenSim/Grid/ScriptServer/RemotingObject.cs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'OpenSim/Grid')

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 @@
 using System.Collections.Generic;
 using System.Text;
 using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.ScriptEngine.DotNetEngine;
+using OpenSim.Region.ScriptEngine.Common;
 
 namespace OpenSim.Grid.ScriptServer
 {
-    public class RemotingObject : MarshalByRefObject 
+    public class RemotingObject : MarshalByRefObject, ScriptServerInterfaces.ServerRemotingObject
     {
         // This object will be exposed over remoting. It is a singleton, so it exists only in as one instance.
 
         // Expose ScriptEngine directly for now ... this is not very secure :)
         // NOTE! CURRENTLY JUST HARDWIRED DOTNETENGINE!
-        public OpenSim.Region.ScriptEngine.DotNetEngine.ScriptEngine ScriptEngine = new OpenSim.Region.ScriptEngine.DotNetEngine.ScriptEngine();
+        //private OpenSim.Region.ScriptEngine.DotNetEngine.ScriptEngine SE =
+        //    new OpenSim.Region.ScriptEngine.DotNetEngine.ScriptEngine();
+        //public OpenSim.Region.ScriptEngine.Common.ScriptServerInterfaces.RemoteEvents Events = 
+        //    (OpenSim.Region.ScriptEngine.Common.ScriptServerInterfaces.RemoteEvents)SE.m_EventManager;
 
+        //private ScriptServerInterfaces.RemoteEvents _events = new abc;
 
-        /// <summary>
-        /// Receives calls from remote grids.
-        /// </summary>
-        /// <returns></returns>
-        public OpenSim.Region.ScriptEngine.DotNetEngine.ScriptEngine GetScriptEngine()
+        ScriptServerInterfaces.RemoteEvents ScriptServerInterfaces.ServerRemotingObject.Events()
         {
-            return ScriptEngine;
+            return null;
         }
     }
 }
-- 
cgit v1.1