diff options
Diffstat (limited to 'OpenSim/Grid/ScriptServer')
-rw-r--r-- | OpenSim/Grid/ScriptServer/Application.cs | 4 | ||||
-rw-r--r-- | OpenSim/Grid/ScriptServer/ScriptServerMain.cs | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/OpenSim/Grid/ScriptServer/Application.cs b/OpenSim/Grid/ScriptServer/Application.cs index 7b62727..9893249 100644 --- a/OpenSim/Grid/ScriptServer/Application.cs +++ b/OpenSim/Grid/ScriptServer/Application.cs | |||
@@ -49,8 +49,8 @@ namespace OpenSim.Grid.ScriptServer | |||
49 | Console.WriteLine("APPLICATION EXCEPTION DETECTED"); | 49 | Console.WriteLine("APPLICATION EXCEPTION DETECTED"); |
50 | Console.WriteLine(""); | 50 | Console.WriteLine(""); |
51 | Console.WriteLine("Application is terminating: " + e.IsTerminating.ToString()); | 51 | Console.WriteLine("Application is terminating: " + e.IsTerminating.ToString()); |
52 | Console.WriteLine("Exception:"); | 52 | //Console.WriteLine("Exception:"); |
53 | Console.WriteLine(e.ExceptionObject.ToString()); | 53 | //Console.WriteLine(e.ExceptionObject.ToString()); |
54 | } | 54 | } |
55 | } | 55 | } |
56 | } \ No newline at end of file | 56 | } \ No newline at end of file |
diff --git a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs index f86aaba..de70347 100644 --- a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs +++ b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs | |||
@@ -27,6 +27,7 @@ | |||
27 | */ | 27 | */ |
28 | 28 | ||
29 | using System.IO; | 29 | using System.IO; |
30 | using libsecondlife; | ||
30 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
31 | using OpenSim.Framework.Console; | 32 | using OpenSim.Framework.Console; |
32 | using OpenSim.Grid.ScriptServer.ScriptServer; | 33 | using OpenSim.Grid.ScriptServer.ScriptServer; |
@@ -46,6 +47,7 @@ namespace OpenSim.Grid.ScriptServer | |||
46 | 47 | ||
47 | // TEMP | 48 | // TEMP |
48 | public static ScriptServerInterfaces.ScriptEngine Engine; | 49 | public static ScriptServerInterfaces.ScriptEngine Engine; |
50 | //public static FakeScene m_Scene = new FakeScene(null,null,null,null,null,null,null,null,null,false, false, false); | ||
49 | 51 | ||
50 | // Objects we use | 52 | // Objects we use |
51 | internal RegionCommManager RegionScriptDaemon; // Listen for incoming from region | 53 | internal RegionCommManager RegionScriptDaemon; // Listen for incoming from region |
@@ -64,6 +66,8 @@ namespace OpenSim.Grid.ScriptServer | |||
64 | 66 | ||
65 | // Load DotNetEngine | 67 | // Load DotNetEngine |
66 | Engine = ScriptEngines.LoadEngine("DotNetEngine"); | 68 | Engine = ScriptEngines.LoadEngine("DotNetEngine"); |
69 | Engine.InitializeEngine(null, m_log, false); | ||
70 | |||
67 | 71 | ||
68 | // Set up server | 72 | // Set up server |
69 | //m_RemotingServer = new RemotingServer(listenPort, "DotNetEngine"); | 73 | //m_RemotingServer = new RemotingServer(listenPort, "DotNetEngine"); |
@@ -85,6 +89,11 @@ namespace OpenSim.Grid.ScriptServer | |||
85 | m_log.Notice("SERVER", "Param " + i + ": " + p[i].ToString()); | 89 | m_log.Notice("SERVER", "Param " + i + ": " + p[i].ToString()); |
86 | } | 90 | } |
87 | } | 91 | } |
92 | |||
93 | if (Command == "OnRezScript") | ||
94 | { | ||
95 | Engine.EventManager().OnRezScript((uint)p[0], new LLUUID((string)p[1]), (string)p[2]); | ||
96 | } | ||
88 | } | 97 | } |
89 | 98 | ||
90 | ~ScriptServerMain() | 99 | ~ScriptServerMain() |