diff options
author | MW | 2007-06-27 15:03:54 +0000 |
---|---|---|
committer | MW | 2007-06-27 15:03:54 +0000 |
commit | 223550b7e4f9eb534728e7763642a2ba6154be96 (patch) | |
tree | cd6ebbefd3c06487f40c3c30b344d6c2fccb1df5 /OpenSim/OpenSim/OpenSimMain.cs | |
parent | * Begun reimplementing scripting. (diff) | |
download | opensim-SC_OLD-223550b7e4f9eb534728e7763642a2ba6154be96.zip opensim-SC_OLD-223550b7e4f9eb534728e7763642a2ba6154be96.tar.gz opensim-SC_OLD-223550b7e4f9eb534728e7763642a2ba6154be96.tar.bz2 opensim-SC_OLD-223550b7e4f9eb534728e7763642a2ba6154be96.tar.xz |
Some very Preliminary work on .net remoting for interregion comms.
a few more classes for CAPS LLSD types.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/OpenSim/OpenSimMain.cs | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs index a6ad15d..7da2263 100644 --- a/OpenSim/OpenSim/OpenSimMain.cs +++ b/OpenSim/OpenSim/OpenSimMain.cs | |||
@@ -44,7 +44,6 @@ using OpenSim.Terrain; | |||
44 | using OpenSim.Framework.Interfaces; | 44 | using OpenSim.Framework.Interfaces; |
45 | using OpenSim.Framework.Types; | 45 | using OpenSim.Framework.Types; |
46 | using OpenSim.Framework; | 46 | using OpenSim.Framework; |
47 | using OpenSim.UserServer; | ||
48 | using OpenSim.Assets; | 47 | using OpenSim.Assets; |
49 | using OpenSim.Caches; | 48 | using OpenSim.Caches; |
50 | using OpenSim.Framework.Console; | 49 | using OpenSim.Framework.Console; |
@@ -129,21 +128,11 @@ namespace OpenSim | |||
129 | 128 | ||
130 | m_log.Verbose( "Main.cs:Startup() - Initialising HTTP server"); | 129 | m_log.Verbose( "Main.cs:Startup() - Initialising HTTP server"); |
131 | 130 | ||
132 | //Login server setup | 131 | |
133 | LoginServer loginServer = null; | ||
134 | LoginServer adminLoginServer = null; | ||
135 | 132 | ||
136 | if (m_sandbox) | 133 | if (m_sandbox) |
137 | { | 134 | { |
138 | httpServer.AddXmlRPCHandler("login_to_simulator", sandboxCommunications.UserServices.XmlRpcLoginMethod); | 135 | httpServer.AddXmlRPCHandler("login_to_simulator", sandboxCommunications.UserServices.XmlRpcLoginMethod); |
139 | |||
140 | /* | ||
141 | loginServer = new LoginServer(regionData[0].IPListenAddr, regionData[0].IPListenPort, regionData[0].RegionLocX, regionData[0].RegionLocY, false); | ||
142 | loginServer.Startup(); | ||
143 | loginServer.SetSessionHandler(sandboxCommunications.SandBoxServices.AddNewSession); | ||
144 | //sandbox mode with loginserver not using accounts | ||
145 | httpServer.AddXmlRPCHandler("login_to_simulator", loginServer.XmlRpcLoginMethod); | ||
146 | */ | ||
147 | } | 136 | } |
148 | 137 | ||
149 | //Start http server | 138 | //Start http server |