diff options
author | onefang | 2019-05-19 21:24:15 +1000 |
---|---|---|
committer | onefang | 2019-05-19 21:24:15 +1000 |
commit | 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb (patch) | |
tree | a9fbc62df9eb2d1d9ba2698d8552eae71eca20d8 /OpenSim/Framework/Servers/MainServer.cs | |
parent | Add a build script. (diff) | |
download | opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.zip opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.gz opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.bz2 opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.xz |
Dump OpenSim 0.9.0.1 into it's own branch.
Diffstat (limited to 'OpenSim/Framework/Servers/MainServer.cs')
-rw-r--r-- | OpenSim/Framework/Servers/MainServer.cs | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/OpenSim/Framework/Servers/MainServer.cs b/OpenSim/Framework/Servers/MainServer.cs index 57931d4..9b1d906 100644 --- a/OpenSim/Framework/Servers/MainServer.cs +++ b/OpenSim/Framework/Servers/MainServer.cs | |||
@@ -223,11 +223,11 @@ namespace OpenSim.Framework.Servers | |||
223 | { | 223 | { |
224 | handlers.AppendFormat( | 224 | handlers.AppendFormat( |
225 | "Registered HTTP Handlers for server at {0}:{1}\n", httpServer.ListenIPAddress, httpServer.Port); | 225 | "Registered HTTP Handlers for server at {0}:{1}\n", httpServer.ListenIPAddress, httpServer.Port); |
226 | 226 | ||
227 | handlers.AppendFormat("* XMLRPC:\n"); | 227 | handlers.AppendFormat("* XMLRPC:\n"); |
228 | foreach (String s in httpServer.GetXmlRpcHandlerKeys()) | 228 | foreach (String s in httpServer.GetXmlRpcHandlerKeys()) |
229 | handlers.AppendFormat("\t{0}\n", s); | 229 | handlers.AppendFormat("\t{0}\n", s); |
230 | 230 | ||
231 | handlers.AppendFormat("* HTTP:\n"); | 231 | handlers.AppendFormat("* HTTP:\n"); |
232 | foreach (String s in httpServer.GetHTTPHandlerKeys()) | 232 | foreach (String s in httpServer.GetHTTPHandlerKeys()) |
233 | handlers.AppendFormat("\t{0}\n", s); | 233 | handlers.AppendFormat("\t{0}\n", s); |
@@ -235,19 +235,19 @@ namespace OpenSim.Framework.Servers | |||
235 | handlers.AppendFormat("* HTTP (poll):\n"); | 235 | handlers.AppendFormat("* HTTP (poll):\n"); |
236 | foreach (String s in httpServer.GetPollServiceHandlerKeys()) | 236 | foreach (String s in httpServer.GetPollServiceHandlerKeys()) |
237 | handlers.AppendFormat("\t{0}\n", s); | 237 | handlers.AppendFormat("\t{0}\n", s); |
238 | 238 | ||
239 | handlers.AppendFormat("* JSONRPC:\n"); | 239 | handlers.AppendFormat("* JSONRPC:\n"); |
240 | foreach (String s in httpServer.GetJsonRpcHandlerKeys()) | 240 | foreach (String s in httpServer.GetJsonRpcHandlerKeys()) |
241 | handlers.AppendFormat("\t{0}\n", s); | 241 | handlers.AppendFormat("\t{0}\n", s); |
242 | 242 | ||
243 | // handlers.AppendFormat("* Agent:\n"); | 243 | // handlers.AppendFormat("* Agent:\n"); |
244 | // foreach (String s in httpServer.GetAgentHandlerKeys()) | 244 | // foreach (String s in httpServer.GetAgentHandlerKeys()) |
245 | // handlers.AppendFormat("\t{0}\n", s); | 245 | // handlers.AppendFormat("\t{0}\n", s); |
246 | 246 | ||
247 | handlers.AppendFormat("* LLSD:\n"); | 247 | handlers.AppendFormat("* LLSD:\n"); |
248 | foreach (String s in httpServer.GetLLSDHandlerKeys()) | 248 | foreach (String s in httpServer.GetLLSDHandlerKeys()) |
249 | handlers.AppendFormat("\t{0}\n", s); | 249 | handlers.AppendFormat("\t{0}\n", s); |
250 | 250 | ||
251 | handlers.AppendFormat("* StreamHandlers ({0}):\n", httpServer.GetStreamHandlerKeys().Count); | 251 | handlers.AppendFormat("* StreamHandlers ({0}):\n", httpServer.GetStreamHandlerKeys().Count); |
252 | foreach (String s in httpServer.GetStreamHandlerKeys()) | 252 | foreach (String s in httpServer.GetStreamHandlerKeys()) |
253 | handlers.AppendFormat("\t{0}\n", s); | 253 | handlers.AppendFormat("\t{0}\n", s); |
@@ -334,7 +334,7 @@ namespace OpenSim.Framework.Servers | |||
334 | { | 334 | { |
335 | if (port == 0) | 335 | if (port == 0) |
336 | return Instance; | 336 | return Instance; |
337 | 337 | ||
338 | if (instance != null && port == Instance.Port) | 338 | if (instance != null && port == Instance.Port) |
339 | return Instance; | 339 | return Instance; |
340 | 340 | ||
@@ -353,5 +353,17 @@ namespace OpenSim.Framework.Servers | |||
353 | return m_Servers[port]; | 353 | return m_Servers[port]; |
354 | } | 354 | } |
355 | } | 355 | } |
356 | |||
357 | public static void Stop() | ||
358 | { | ||
359 | lock (m_Servers) | ||
360 | { | ||
361 | foreach (BaseHttpServer httpServer in m_Servers.Values) | ||
362 | { | ||
363 | httpServer.Stop(); | ||
364 | } | ||
365 | } | ||
366 | } | ||
367 | |||
356 | } | 368 | } |
357 | } \ No newline at end of file | 369 | } \ No newline at end of file |