diff options
author | Melanie | 2010-01-16 00:05:08 +0000 |
---|---|---|
committer | Melanie | 2010-01-16 00:05:08 +0000 |
commit | 10f8c2ea9b67158c32b361f9652d503ea48de292 (patch) | |
tree | be0d88bc4b6df3825a0d27f62a08170d7c7ad262 /OpenSim/Framework/MainServer.cs | |
parent | Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/open... (diff) | |
parent | Add "create user" instructions to README.txt (diff) | |
download | opensim-SC_OLD-10f8c2ea9b67158c32b361f9652d503ea48de292.zip opensim-SC_OLD-10f8c2ea9b67158c32b361f9652d503ea48de292.tar.gz opensim-SC_OLD-10f8c2ea9b67158c32b361f9652d503ea48de292.tar.bz2 opensim-SC_OLD-10f8c2ea9b67158c32b361f9652d503ea48de292.tar.xz |
Merge branch 'master' into presence-refactor
This merge was very conflicted. I think I got them all, but I can't be sure.
I had to merge to master or risk divergence to the point of unmergeability.
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)) |