diff options
author | Adam Frisby | 2008-05-01 18:04:42 +0000 |
---|---|---|
committer | Adam Frisby | 2008-05-01 18:04:42 +0000 |
commit | 20a9bf08f51351e1e0a9de94f184ff56cd572665 (patch) | |
tree | 52da64dab26353b903c8e4befed0178fa72a188b /OpenSim/Grid/ScriptServer/ScriptServerMain.cs | |
parent | More config cleanup in LaunchSLClient. (diff) | |
download | opensim-SC-20a9bf08f51351e1e0a9de94f184ff56cd572665.zip opensim-SC-20a9bf08f51351e1e0a9de94f184ff56cd572665.tar.gz opensim-SC-20a9bf08f51351e1e0a9de94f184ff56cd572665.tar.bz2 opensim-SC-20a9bf08f51351e1e0a9de94f184ff56cd572665.tar.xz |
* Rolled back a few changes.
Diffstat (limited to 'OpenSim/Grid/ScriptServer/ScriptServerMain.cs')
-rw-r--r-- | OpenSim/Grid/ScriptServer/ScriptServerMain.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs index 131ff34..528b51c 100644 --- a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs +++ b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs | |||
@@ -44,20 +44,20 @@ namespace OpenSim.Grid.ScriptServer | |||
44 | // | 44 | // |
45 | // Root object. Creates objects used. | 45 | // Root object. Creates objects used. |
46 | // | 46 | // |
47 | private int listenPort = 8010; | ||
47 | 48 | ||
48 | // TEMP | 49 | // TEMP |
49 | public static ScriptServerInterfaces.ScriptEngine Engine; | 50 | public static ScriptServerInterfaces.ScriptEngine Engine; |
50 | private int listenPort = 8010; | ||
51 | //public static FakeScene m_Scene = new FakeScene(null,null,null,null,null,null,null,null,null,false, false, false); | 51 | //public static FakeScene m_Scene = new FakeScene(null,null,null,null,null,null,null,null,null,false, false, false); |
52 | 52 | ||
53 | // Objects we use | 53 | // Objects we use |
54 | internal RegionCommManager RegionScriptDaemon; // Listen for incoming from region | ||
55 | internal ScriptEngineManager ScriptEngines; // Loads scriptengines | ||
54 | //internal RemotingServer m_RemotingServer; | 56 | //internal RemotingServer m_RemotingServer; |
55 | internal TCPServer m_TCPServer; | 57 | internal TCPServer m_TCPServer; |
56 | internal RegionCommManager RegionScriptDaemon; // Listen for incoming from region | ||
57 | internal TRPC_Remote RPC; | 58 | internal TRPC_Remote RPC; |
58 | internal ScriptEngineManager ScriptEngines; // Loads scriptengines | ||
59 | 59 | ||
60 | public ScriptServerMain() | 60 | public ScriptServerMain() |
61 | { | 61 | { |
62 | m_console = CreateConsole(); | 62 | m_console = CreateConsole(); |
63 | 63 | ||
@@ -68,13 +68,13 @@ namespace OpenSim.Grid.ScriptServer | |||
68 | Engine = ScriptEngines.LoadEngine("DotNetEngine"); | 68 | Engine = ScriptEngines.LoadEngine("DotNetEngine"); |
69 | 69 | ||
70 | Engine.InitializeEngine(null, null, false, Engine.GetScriptManager()); | 70 | Engine.InitializeEngine(null, null, false, Engine.GetScriptManager()); |
71 | 71 | ||
72 | 72 | ||
73 | // Set up server | 73 | // Set up server |
74 | //m_RemotingServer = new RemotingServer(listenPort, "DotNetEngine"); | 74 | //m_RemotingServer = new RemotingServer(listenPort, "DotNetEngine"); |
75 | m_TCPServer = new TCPServer(listenPort); | 75 | m_TCPServer = new TCPServer(listenPort); |
76 | RPC = new TRPC_Remote(m_TCPServer); | 76 | RPC = new TRPC_Remote(m_TCPServer); |
77 | RPC.ReceiveCommand += RPC_ReceiveCommand; | 77 | RPC.ReceiveCommand += new TRPC_Remote.ReceiveCommandDelegate(RPC_ReceiveCommand); |
78 | m_TCPServer.StartListen(); | 78 | m_TCPServer.StartListen(); |
79 | 79 | ||
80 | Console.ReadLine(); | 80 | Console.ReadLine(); |
@@ -93,7 +93,7 @@ namespace OpenSim.Grid.ScriptServer | |||
93 | 93 | ||
94 | if (Command == "OnRezScript") | 94 | if (Command == "OnRezScript") |
95 | { | 95 | { |
96 | Engine.EventManager().OnRezScript((uint) p[0], new LLUUID((string) p[1]), (string) p[2]); | 96 | Engine.EventManager().OnRezScript((uint)p[0], new LLUUID((string)p[1]), (string)p[2]); |
97 | } | 97 | } |
98 | } | 98 | } |
99 | 99 | ||
@@ -106,4 +106,4 @@ namespace OpenSim.Grid.ScriptServer | |||
106 | return new ConsoleBase("ScriptServer", this); | 106 | return new ConsoleBase("ScriptServer", this); |
107 | } | 107 | } |
108 | } | 108 | } |
109 | } \ No newline at end of file | 109 | } |