Dynamic loading of ScriptEngine in ScriptServer

ScriptServer event pipe (OpenSim->ScriptServer->ScriptEngine) should in theory be done

1 files changed, 1 insertions, 9 deletions

diff --git a/OpenSim/Grid/ScriptServer/RemotingObject.cs b/OpenSim/Grid/ScriptServer/RemotingObject.cs
index 915d020..54aff7a 100644
--- a/OpenSim/Grid/ScriptServer/RemotingObject.cs
+++ b/OpenSim/Grid/ScriptServer/RemotingObject.cs
@@ -10,18 +10,10 @@ namespace OpenSim.Grid.ScriptServer
     {
         // 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!
-        //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;
 
         ScriptServerInterfaces.RemoteEvents ScriptServerInterfaces.ServerRemotingObject.Events()
         {
-            return null;
+            return ScriptServerMain.Engine.EventManager();
         }
     }
 }