aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Grid/ScriptServer/Application.cs (renamed from OpenSim/Grid/ScriptServer/Main.cs)4
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServer.cs27
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs (renamed from OpenSim/Grid/ScriptServer/RegionConnectionManager.cs)0
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionScriptDaemon.cs (renamed from OpenSim/Grid/ScriptServer/RegionScriptDaemon.cs)4
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServer/RegionsManager.cs (renamed from OpenSim/Grid/ScriptServer/RegionsManager.cs)4
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngine/ScriptEngineInterface.cs (renamed from OpenSim/Grid/ScriptServer/ScriptEngineInterface.cs)0
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngine/ScriptEngineLoader.cs (renamed from OpenSim/Grid/ScriptServer/ScriptEngineLoader.cs)0
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServerMain.cs49
8 files changed, 55 insertions, 33 deletions
diff --git a/OpenSim/Grid/ScriptServer/Main.cs b/OpenSim/Grid/ScriptServer/Application.cs
index 9f16ea8..e7a6590 100644
--- a/OpenSim/Grid/ScriptServer/Main.cs
+++ b/OpenSim/Grid/ScriptServer/Application.cs
@@ -34,12 +34,12 @@ namespace OpenSim.Grid.ScriptServer
34 class OpenScript_Main 34 class OpenScript_Main
35 { 35 {
36 36
37 public static ScriptServer SE; 37 public static ScriptServerMain SE;
38 38
39 static void Main(string[] args) 39 static void Main(string[] args)
40 { 40 {
41 // Application is starting 41 // Application is starting
42 SE = new ScriptServer(); 42 SE = new ScriptServerMain();
43 } 43 }
44 44
45 } 45 }
diff --git a/OpenSim/Grid/ScriptServer/ScriptServer.cs b/OpenSim/Grid/ScriptServer/ScriptServer.cs
deleted file mode 100644
index 2c26027..0000000
--- a/OpenSim/Grid/ScriptServer/ScriptServer.cs
+++ /dev/null
@@ -1,27 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4
5namespace OpenSim.Grid.ScriptServer
6{
7 class ScriptServer
8 {
9 public RegionScriptDaemon RegionScriptDaemon; // Listen for incoming from region
10 public RegionsManager RegionManager; // Handle regions
11 public ScriptEngineLoader ScriptEngineLoader; // Loads scriptengines
12
13 public ScriptServer()
14 {
15 RegionScriptDaemon = new RegionScriptDaemon(this);
16 RegionManager = new RegionsManager(this);
17 //ScriptEngineLoader = new ScriptEngineLoader(this);
18 }
19
20 ~ScriptServer()
21 {
22 }
23
24
25
26 }
27}
diff --git a/OpenSim/Grid/ScriptServer/RegionConnectionManager.cs b/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs
index 6a517e9..6a517e9 100644
--- a/OpenSim/Grid/ScriptServer/RegionConnectionManager.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs
diff --git a/OpenSim/Grid/ScriptServer/RegionScriptDaemon.cs b/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionScriptDaemon.cs
index 435c09b..0385693 100644
--- a/OpenSim/Grid/ScriptServer/RegionScriptDaemon.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionScriptDaemon.cs
@@ -37,8 +37,8 @@ namespace OpenSim.Grid.ScriptServer
37 { 37 {
38 private Thread listenThread; 38 private Thread listenThread;
39 39
40 public ScriptServer m_ScriptServer; 40 public ScriptServerMain m_ScriptServer;
41 public RegionScriptDaemon(ScriptServer scriptServer) 41 public RegionScriptDaemon(ScriptServerMain scriptServer)
42 { 42 {
43 m_ScriptServer = scriptServer; 43 m_ScriptServer = scriptServer;
44 } 44 }
diff --git a/OpenSim/Grid/ScriptServer/RegionsManager.cs b/OpenSim/Grid/ScriptServer/ScriptServer/RegionsManager.cs
index 0e1fad1..eeec92b 100644
--- a/OpenSim/Grid/ScriptServer/RegionsManager.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/RegionsManager.cs
@@ -9,8 +9,8 @@ namespace OpenSim.Grid.ScriptServer
9 { 9 {
10 private List<RegionConnectionManager> Regions = new List<RegionConnectionManager>(); 10 private List<RegionConnectionManager> Regions = new List<RegionConnectionManager>();
11 11
12 public ScriptServer m_ScriptServer; 12 public ScriptServerMain m_ScriptServer;
13 public RegionsManager(ScriptServer scriptServer) 13 public RegionsManager(ScriptServerMain scriptServer)
14 { 14 {
15 m_ScriptServer = scriptServer; 15 m_ScriptServer = scriptServer;
16 } 16 }
diff --git a/OpenSim/Grid/ScriptServer/ScriptEngineInterface.cs b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngine/ScriptEngineInterface.cs
index 7440bcb..7440bcb 100644
--- a/OpenSim/Grid/ScriptServer/ScriptEngineInterface.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngine/ScriptEngineInterface.cs
diff --git a/OpenSim/Grid/ScriptServer/ScriptEngineLoader.cs b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngine/ScriptEngineLoader.cs
index 1b5dc39..1b5dc39 100644
--- a/OpenSim/Grid/ScriptServer/ScriptEngineLoader.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngine/ScriptEngineLoader.cs
diff --git a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
new file mode 100644
index 0000000..4fce3d6
--- /dev/null
+++ b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
@@ -0,0 +1,49 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using System.IO;
5using OpenSim.Framework.Console;
6using OpenSim.Framework.Utilities;
7
8namespace OpenSim.Grid.ScriptServer
9{
10 class ScriptServerMain : conscmd_callback
11 {
12 private readonly string m_logFilename = ("region-console.log");
13 public RegionScriptDaemon RegionScriptDaemon; // Listen for incoming from region
14 public RegionsManager RegionManager; // Handle regions
15 public ScriptEngineLoader ScriptEngineLoader; // Loads scriptengines
16 private LogBase m_log;
17
18 public ScriptServerMain()
19 {
20 m_log = CreateLog();
21
22 RegionScriptDaemon = new RegionScriptDaemon(this);
23 RegionManager = new RegionsManager(this);
24 ScriptEngineLoader = new ScriptEngineLoader(m_log);
25 }
26
27 ~ScriptServerMain()
28 {
29 }
30
31 protected LogBase CreateLog()
32 {
33 if (!Directory.Exists(Util.logDir()))
34 {
35 Directory.CreateDirectory(Util.logDir());
36 }
37
38 return new LogBase((Path.Combine(Util.logDir(), m_logFilename)), "Region", this, false);
39 }
40
41 public void RunCmd(string command, string[] cmdparams)
42 {
43 }
44 public void Show(string ShowWhat)
45 {
46 }
47
48 }
49}