diff options
| author | Kitto Flora | 2010-11-11 04:51:05 +0000 |
|---|---|---|
| committer | Kitto Flora | 2010-11-11 04:51:05 +0000 |
| commit | b2aeea66e36593ccab973240bab43724f577165b (patch) | |
| tree | 4b7bed905081a7678411f251af260e14261cc545 /OpenSim/Framework/MainServer.cs | |
| parent | Fix excessive forward motion and flailing while descending a slope, prevent a... (diff) | |
| parent | Prevent teleporting to a region when the egent is banned in all parcels (diff) | |
| download | opensim-SC_OLD-b2aeea66e36593ccab973240bab43724f577165b.zip opensim-SC_OLD-b2aeea66e36593ccab973240bab43724f577165b.tar.gz opensim-SC_OLD-b2aeea66e36593ccab973240bab43724f577165b.tar.bz2 opensim-SC_OLD-b2aeea66e36593ccab973240bab43724f577165b.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework/MainServer.cs')
| -rw-r--r-- | OpenSim/Framework/MainServer.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/MainServer.cs b/OpenSim/Framework/MainServer.cs index 8ccabec..0515b16 100644 --- a/OpenSim/Framework/MainServer.cs +++ b/OpenSim/Framework/MainServer.cs | |||
| @@ -36,7 +36,7 @@ namespace OpenSim.Framework | |||
| 36 | public class MainServer | 36 | public class MainServer |
| 37 | { | 37 | { |
| 38 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 38 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
| 39 | 39 | ||
| 40 | private static BaseHttpServer instance = null; | 40 | private static BaseHttpServer instance = null; |
| 41 | private static Dictionary<uint, BaseHttpServer> m_Servers = | 41 | private static Dictionary<uint, BaseHttpServer> m_Servers = |
| 42 | new Dictionary<uint, BaseHttpServer>(); | 42 | new Dictionary<uint, BaseHttpServer>(); |
| @@ -64,8 +64,8 @@ namespace OpenSim.Framework | |||
| 64 | 64 | ||
| 65 | m_Servers[port] = new BaseHttpServer(port); | 65 | m_Servers[port] = new BaseHttpServer(port); |
| 66 | 66 | ||
| 67 | if (ipaddr != null ) | 67 | if (ipaddr != null) |
| 68 | m_Servers[port].ListenIPAddress = ipaddr; | 68 | m_Servers[port].ListenIPAddress = ipaddr; |
| 69 | 69 | ||
| 70 | 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); |
| 71 | m_Servers[port].Start(); | 71 | m_Servers[port].Start(); |