diff options
| author | Melanie | 2010-01-11 03:50:24 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-11 03:50:24 +0000 |
| commit | 20e748205eb9fbe19d13eec506a9661f93db4dff (patch) | |
| tree | f91575474cdd083708eb4fabb2a2248a01039e90 /OpenSim/Framework | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Add the console port setting to ROBUST, too (diff) | |
| download | opensim-SC_OLD-20e748205eb9fbe19d13eec506a9661f93db4dff.zip opensim-SC_OLD-20e748205eb9fbe19d13eec506a9661f93db4dff.tar.gz opensim-SC_OLD-20e748205eb9fbe19d13eec506a9661f93db4dff.tar.bz2 opensim-SC_OLD-20e748205eb9fbe19d13eec506a9661f93db4dff.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/MainServer.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/MainServer.cs b/OpenSim/Framework/MainServer.cs index 7da4893..84cc05e 100644 --- a/OpenSim/Framework/MainServer.cs +++ b/OpenSim/Framework/MainServer.cs | |||
| @@ -32,7 +32,7 @@ namespace OpenSim.Framework | |||
| 32 | { | 32 | { |
| 33 | public class MainServer | 33 | public class MainServer |
| 34 | { | 34 | { |
| 35 | private static BaseHttpServer instance; | 35 | private static BaseHttpServer instance = null; |
| 36 | private static Dictionary<uint, BaseHttpServer> m_Servers = | 36 | private static Dictionary<uint, BaseHttpServer> m_Servers = |
| 37 | new Dictionary<uint, BaseHttpServer>(); | 37 | new Dictionary<uint, BaseHttpServer>(); |
| 38 | 38 | ||
| @@ -46,7 +46,7 @@ namespace OpenSim.Framework | |||
| 46 | { | 46 | { |
| 47 | if (port == 0) | 47 | if (port == 0) |
| 48 | return Instance; | 48 | return Instance; |
| 49 | if (port == Instance.Port) | 49 | if (instance != null && port == Instance.Port) |
| 50 | return Instance; | 50 | return Instance; |
| 51 | 51 | ||
| 52 | if (m_Servers.ContainsKey(port)) | 52 | if (m_Servers.ContainsKey(port)) |