diff options
author | Jonathan Freedman | 2010-11-05 19:10:02 -0700 |
---|---|---|
committer | Jonathan Freedman | 2010-11-05 19:10:02 -0700 |
commit | 4f40374464899dad82abdb9c36ea863ceac0d83f (patch) | |
tree | a9b116ccca55fb07b8c79ab7f6fdfafc8466d740 /OpenSim/Framework/MainServer.cs | |
parent | Merge branch 'master' into mantis5110 (diff) | |
parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
download | opensim-SC_OLD-4f40374464899dad82abdb9c36ea863ceac0d83f.zip opensim-SC_OLD-4f40374464899dad82abdb9c36ea863ceac0d83f.tar.gz opensim-SC_OLD-4f40374464899dad82abdb9c36ea863ceac0d83f.tar.bz2 opensim-SC_OLD-4f40374464899dad82abdb9c36ea863ceac0d83f.tar.xz |
Merge git://github.com/opensim/opensim into mantis5110
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/MainServer.cs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Framework/MainServer.cs b/OpenSim/Framework/MainServer.cs index 1f5f208..8ccabec 100644 --- a/OpenSim/Framework/MainServer.cs +++ b/OpenSim/Framework/MainServer.cs | |||
@@ -27,6 +27,7 @@ | |||
27 | 27 | ||
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using System.Reflection; | 29 | using System.Reflection; |
30 | using System.Net; | ||
30 | using log4net; | 31 | using log4net; |
31 | using OpenSim.Framework.Servers.HttpServer; | 32 | using OpenSim.Framework.Servers.HttpServer; |
32 | 33 | ||
@@ -48,6 +49,11 @@ namespace OpenSim.Framework | |||
48 | 49 | ||
49 | public static IHttpServer GetHttpServer(uint port) | 50 | public static IHttpServer GetHttpServer(uint port) |
50 | { | 51 | { |
52 | return GetHttpServer(port,null); | ||
53 | } | ||
54 | |||
55 | public static IHttpServer GetHttpServer(uint port, IPAddress ipaddr) | ||
56 | { | ||
51 | if (port == 0) | 57 | if (port == 0) |
52 | return Instance; | 58 | return Instance; |
53 | if (instance != null && port == Instance.Port) | 59 | if (instance != null && port == Instance.Port) |
@@ -58,6 +64,9 @@ namespace OpenSim.Framework | |||
58 | 64 | ||
59 | m_Servers[port] = new BaseHttpServer(port); | 65 | m_Servers[port] = new BaseHttpServer(port); |
60 | 66 | ||
67 | if (ipaddr != null ) | ||
68 | m_Servers[port].ListenIPAddress = ipaddr; | ||
69 | |||
61 | m_log.InfoFormat("[MAIN HTTP SERVER]: Starting main http server on port {0}", port); | 70 | m_log.InfoFormat("[MAIN HTTP SERVER]: Starting main http server on port {0}", port); |
62 | m_Servers[port].Start(); | 71 | m_Servers[port].Start(); |
63 | 72 | ||