diff options
author | Diva Canto | 2010-01-10 21:43:41 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-10 21:43:41 -0800 |
commit | 7e6980b20d881bc1e441d004ad5e24af63e58c08 (patch) | |
tree | fccb8733920e52071e7e8a4ac8b41f0d584443cd | |
parent | NetworkServersInfo removed from CommsManager. (diff) | |
download | opensim-SC-7e6980b20d881bc1e441d004ad5e24af63e58c08.zip opensim-SC-7e6980b20d881bc1e441d004ad5e24af63e58c08.tar.gz opensim-SC-7e6980b20d881bc1e441d004ad5e24af63e58c08.tar.bz2 opensim-SC-7e6980b20d881bc1e441d004ad5e24af63e58c08.tar.xz |
dust
-rw-r--r-- | OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs | 42 |
1 files changed, 2 insertions, 40 deletions
diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs index 66a8890..7fdff60 100644 --- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs +++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs | |||
@@ -104,35 +104,12 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager | |||
104 | { | 104 | { |
105 | LibraryRootFolder libraryRootFolder = new LibraryRootFolder(m_openSim.ConfigurationSettings.LibrariesXMLFile); | 105 | LibraryRootFolder libraryRootFolder = new LibraryRootFolder(m_openSim.ConfigurationSettings.LibrariesXMLFile); |
106 | 106 | ||
107 | bool hgrid = m_openSim.ConfigSource.Source.Configs["Startup"].GetBoolean("hypergrid", false); | 107 | InitialiseStandardServices(libraryRootFolder); |
108 | |||
109 | if (hgrid) | ||
110 | { | ||
111 | InitialiseHGServices(openSim, libraryRootFolder); | ||
112 | } | ||
113 | else | ||
114 | { | ||
115 | InitialiseStandardServices(libraryRootFolder); | ||
116 | } | ||
117 | 108 | ||
118 | openSim.CommunicationsManager = m_commsManager; | 109 | openSim.CommunicationsManager = m_commsManager; |
119 | } | 110 | } |
120 | 111 | ||
121 | protected void InitialiseHGServices(OpenSimBase openSim, LibraryRootFolder libraryRootFolder) | 112 | protected void InitialiseStandardServices(LibraryRootFolder libraryRootFolder) |
122 | { | ||
123 | // Standalone mode is determined by !startupConfig.GetBoolean("gridmode", false) | ||
124 | if (m_openSim.ConfigurationSettings.Standalone) | ||
125 | { | ||
126 | InitialiseHGStandaloneServices(libraryRootFolder); | ||
127 | } | ||
128 | else | ||
129 | { | ||
130 | // We are in grid mode | ||
131 | InitialiseHGGridServices(libraryRootFolder); | ||
132 | } | ||
133 | } | ||
134 | |||
135 | protected void InitialiseStandardServices(LibraryRootFolder libraryRootFolder) | ||
136 | { | 113 | { |
137 | // Standalone mode is determined by !startupConfig.GetBoolean("gridmode", false) | 114 | // Standalone mode is determined by !startupConfig.GetBoolean("gridmode", false) |
138 | if (m_openSim.ConfigurationSettings.Standalone) | 115 | if (m_openSim.ConfigurationSettings.Standalone) |
@@ -165,21 +142,6 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager | |||
165 | m_httpServer.AddStreamHandler(new OpenSim.UXSimStatusHandler(m_openSim)); | 142 | m_httpServer.AddStreamHandler(new OpenSim.UXSimStatusHandler(m_openSim)); |
166 | } | 143 | } |
167 | 144 | ||
168 | protected virtual void InitialiseHGStandaloneServices(LibraryRootFolder libraryRootFolder) | ||
169 | { | ||
170 | |||
171 | CreateGridInfoService(); | ||
172 | } | ||
173 | |||
174 | protected virtual void InitialiseHGGridServices(LibraryRootFolder libraryRootFolder) | ||
175 | { | ||
176 | |||
177 | m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler()); | ||
178 | m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim)); | ||
179 | if (m_openSim.userStatsURI != String.Empty) | ||
180 | m_httpServer.AddStreamHandler(new OpenSim.UXSimStatusHandler(m_openSim)); | ||
181 | } | ||
182 | |||
183 | private void CreateGridInfoService() | 145 | private void CreateGridInfoService() |
184 | { | 146 | { |
185 | } | 147 | } |