diff options
| author | Diva Canto | 2011-05-06 09:09:13 -0700 |
|---|---|---|
| committer | Diva Canto | 2011-05-06 09:09:13 -0700 |
| commit | 50c0069f7d3f3fa90fcdb8f52ae02cf6f3680efe (patch) | |
| tree | 546d13e4f4925b82dc8a0fa037eeb0928d188132 /OpenSim/Framework/MainServer.cs | |
| parent | Bug fix: iars under Library weren't being loaded. (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-50c0069f7d3f3fa90fcdb8f52ae02cf6f3680efe.zip opensim-SC_OLD-50c0069f7d3f3fa90fcdb8f52ae02cf6f3680efe.tar.gz opensim-SC_OLD-50c0069f7d3f3fa90fcdb8f52ae02cf6f3680efe.tar.bz2 opensim-SC_OLD-50c0069f7d3f3fa90fcdb8f52ae02cf6f3680efe.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/MainServer.cs')
| -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) |