diff options
| author | Melanie | 2011-05-08 20:20:40 +0100 |
|---|---|---|
| committer | Melanie | 2011-05-08 20:20:40 +0100 |
| commit | 1be67914fab348115faa1fc9e9ecffbf7c303093 (patch) | |
| tree | 7ad4917efae6aebeefa51fe03b1d1aac3e95efcb /OpenSim/Framework/MainServer.cs | |
| parent | Enable compressed (gzip) fatpack transfers. (diff) | |
| parent | Mantis #5472 (diff) | |
| download | opensim-SC_OLD-1be67914fab348115faa1fc9e9ecffbf7c303093.zip opensim-SC_OLD-1be67914fab348115faa1fc9e9ecffbf7c303093.tar.gz opensim-SC_OLD-1be67914fab348115faa1fc9e9ecffbf7c303093.tar.bz2 opensim-SC_OLD-1be67914fab348115faa1fc9e9ecffbf7c303093.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/MainServer.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Framework/MainServer.cs b/OpenSim/Framework/MainServer.cs index 0515b16..a3e0a26 100644 --- a/OpenSim/Framework/MainServer.cs +++ b/OpenSim/Framework/MainServer.cs | |||
| @@ -52,6 +52,11 @@ namespace OpenSim.Framework | |||
| 52 | return GetHttpServer(port,null); | 52 | return GetHttpServer(port,null); |
| 53 | } | 53 | } |
| 54 | 54 | ||
| 55 | public static void AddHttpServer(BaseHttpServer server) | ||
| 56 | { | ||
| 57 | m_Servers.Add(server.Port, server); | ||
| 58 | } | ||
| 59 | |||
| 55 | public static IHttpServer GetHttpServer(uint port, IPAddress ipaddr) | 60 | public static IHttpServer GetHttpServer(uint port, IPAddress ipaddr) |
| 56 | { | 61 | { |
| 57 | if (port == 0) | 62 | if (port == 0) |