diff options
author | Diva Canto | 2010-01-10 21:37:36 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-10 21:37:36 -0800 |
commit | 751e70af788bf27fa0401c25d899f73186c8eafa (patch) | |
tree | 4790d180a9986c41e52c9910790565ac80fb40db /OpenSim/ApplicationPlugins | |
parent | Some more unnecessary things deleted in Framework.Communications. (diff) | |
download | opensim-SC-751e70af788bf27fa0401c25d899f73186c8eafa.zip opensim-SC-751e70af788bf27fa0401c25d899f73186c8eafa.tar.gz opensim-SC-751e70af788bf27fa0401c25d899f73186c8eafa.tar.bz2 opensim-SC-751e70af788bf27fa0401c25d899f73186c8eafa.tar.xz |
NetworkServersInfo removed from CommsManager.
Diffstat (limited to 'OpenSim/ApplicationPlugins')
-rw-r--r-- | OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs index 4683f53..66a8890 100644 --- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs +++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs | |||
@@ -36,9 +36,6 @@ using OpenSim.Framework.Communications.Cache; | |||
36 | using OpenSim.Framework.Communications.Osp; | 36 | using OpenSim.Framework.Communications.Osp; |
37 | using OpenSim.Framework.Servers; | 37 | using OpenSim.Framework.Servers; |
38 | using OpenSim.Framework.Servers.HttpServer; | 38 | using OpenSim.Framework.Servers.HttpServer; |
39 | using OpenSim.Region.Communications.Hypergrid; | ||
40 | using OpenSim.Region.Communications.Local; | ||
41 | using OpenSim.Region.Communications.OGS1; | ||
42 | 39 | ||
43 | namespace OpenSim.ApplicationPlugins.CreateCommsManager | 40 | namespace OpenSim.ApplicationPlugins.CreateCommsManager |
44 | { | 41 | { |
@@ -155,18 +152,12 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager | |||
155 | /// <param name="libraryRootFolder"></param> | 152 | /// <param name="libraryRootFolder"></param> |
156 | protected virtual void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder) | 153 | protected virtual void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder) |
157 | { | 154 | { |
158 | m_commsManager | ||
159 | = new CommunicationsLocal( | ||
160 | m_openSim.ConfigurationSettings, m_openSim.NetServersInfo, | ||
161 | libraryRootFolder); | ||
162 | 155 | ||
163 | CreateGridInfoService(); | 156 | CreateGridInfoService(); |
164 | } | 157 | } |
165 | 158 | ||
166 | protected virtual void InitialiseGridServices(LibraryRootFolder libraryRootFolder) | 159 | protected virtual void InitialiseGridServices(LibraryRootFolder libraryRootFolder) |
167 | { | 160 | { |
168 | m_commsManager | ||
169 | = new CommunicationsOGS1(m_openSim.NetServersInfo, libraryRootFolder); | ||
170 | 161 | ||
171 | m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler()); | 162 | m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler()); |
172 | m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim)); | 163 | m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim)); |
@@ -176,20 +167,12 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager | |||
176 | 167 | ||
177 | protected virtual void InitialiseHGStandaloneServices(LibraryRootFolder libraryRootFolder) | 168 | protected virtual void InitialiseHGStandaloneServices(LibraryRootFolder libraryRootFolder) |
178 | { | 169 | { |
179 | m_commsManager | 170 | |
180 | = new HGCommunicationsStandalone( | ||
181 | m_openSim.ConfigurationSettings, m_openSim.NetServersInfo, m_httpServer, | ||
182 | libraryRootFolder, false); | ||
183 | |||
184 | CreateGridInfoService(); | 171 | CreateGridInfoService(); |
185 | } | 172 | } |
186 | 173 | ||
187 | protected virtual void InitialiseHGGridServices(LibraryRootFolder libraryRootFolder) | 174 | protected virtual void InitialiseHGGridServices(LibraryRootFolder libraryRootFolder) |
188 | { | 175 | { |
189 | m_commsManager | ||
190 | = new HGCommunicationsGridMode( | ||
191 | m_openSim.NetServersInfo, | ||
192 | m_openSim.SceneManager, libraryRootFolder); | ||
193 | 176 | ||
194 | m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler()); | 177 | m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler()); |
195 | m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim)); | 178 | m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim)); |