diff options
| author | Diva Canto | 2010-01-15 17:24:41 -0800 |
|---|---|---|
| committer | Diva Canto | 2010-01-15 17:24:41 -0800 |
| commit | 32bfbdab6f6bbbfaae0df0ab410af7b9c42a3a4f (patch) | |
| tree | e20c1afa3edc76101eea15765a447b13b3c4946e /OpenSim/Framework/MainServer.cs | |
| parent | Comment (diff) | |
| parent | Merge branch 'master' into presence-refactor (diff) | |
| download | opensim-SC-32bfbdab6f6bbbfaae0df0ab410af7b9c42a3a4f.zip opensim-SC-32bfbdab6f6bbbfaae0df0ab410af7b9c42a3a4f.tar.gz opensim-SC-32bfbdab6f6bbbfaae0df0ab410af7b9c42a3a4f.tar.bz2 opensim-SC-32bfbdab6f6bbbfaae0df0ab410af7b9c42a3a4f.tar.xz | |
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
Diffstat (limited to '')
| -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)) |