diff options
author | Diva Canto | 2010-01-11 08:11:04 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-11 08:11:04 -0800 |
commit | 19ad68e5e4ef4ce8e5cb41f3ddec0dc6e839a53c (patch) | |
tree | ab4c53ffbb383dd191e905684119c8b7c1171bb5 /OpenSim/Region/Application/OpenSim.cs | |
parent | OpenSim/Framework/Communications/Cache deleted. LibraryRootFolder deleted. (diff) | |
download | opensim-SC-19ad68e5e4ef4ce8e5cb41f3ddec0dc6e839a53c.zip opensim-SC-19ad68e5e4ef4ce8e5cb41f3ddec0dc6e839a53c.tar.gz opensim-SC-19ad68e5e4ef4ce8e5cb41f3ddec0dc6e839a53c.tar.bz2 opensim-SC-19ad68e5e4ef4ce8e5cb41f3ddec0dc6e839a53c.tar.xz |
Moved MainServer.Instance.AddStreamHandler(new OpenSim.SimStatusHandler()); around, because it was crashing. Now it crashes elsewhere.
Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index aedf21e..9f5e173 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -148,13 +148,13 @@ namespace OpenSim | |||
148 | 148 | ||
149 | RegisterConsoleCommands(); | 149 | RegisterConsoleCommands(); |
150 | 150 | ||
151 | base.StartupSpecific(); | ||
152 | |||
151 | MainServer.Instance.AddStreamHandler(new OpenSim.SimStatusHandler()); | 153 | MainServer.Instance.AddStreamHandler(new OpenSim.SimStatusHandler()); |
152 | MainServer.Instance.AddStreamHandler(new OpenSim.XSimStatusHandler(this)); | 154 | MainServer.Instance.AddStreamHandler(new OpenSim.XSimStatusHandler(this)); |
153 | if (userStatsURI != String.Empty) | 155 | if (userStatsURI != String.Empty) |
154 | MainServer.Instance.AddStreamHandler(new OpenSim.UXSimStatusHandler(this)); | 156 | MainServer.Instance.AddStreamHandler(new OpenSim.UXSimStatusHandler(this)); |
155 | 157 | ||
156 | base.StartupSpecific(); | ||
157 | |||
158 | if (m_console is RemoteConsole) | 158 | if (m_console is RemoteConsole) |
159 | ((RemoteConsole)m_console).SetServer(m_httpServer); | 159 | ((RemoteConsole)m_console).SetServer(m_httpServer); |
160 | 160 | ||