aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/CreateCommsManager
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/ApplicationPlugins/CreateCommsManager')
-rw-r--r--OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs40
1 files changed, 4 insertions, 36 deletions
diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
index 3ad137e..1059338 100644
--- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
@@ -166,26 +166,10 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
166 /// <param name="libraryRootFolder"></param> 166 /// <param name="libraryRootFolder"></param>
167 protected virtual void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder) 167 protected virtual void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder)
168 { 168 {
169 LocalInventoryService inventoryService = new LocalInventoryService();
170 List<IInventoryDataPlugin> plugins
171 = DataPluginFactory.LoadDataPlugins<IInventoryDataPlugin>(
172 m_openSim.ConfigurationSettings.StandaloneInventoryPlugin,
173 m_openSim.ConfigurationSettings.StandaloneInventorySource);
174
175 foreach (IInventoryDataPlugin plugin in plugins)
176 {
177 // Using the OSP wrapper plugin for database plugins should be made configurable at some point
178 inventoryService.AddPlugin(new OspInventoryWrapperPlugin(plugin));
179 }
180
181 LocalBackEndServices backendService = new LocalBackEndServices();
182
183 //LocalLoginService loginService = CreateLoginService(libraryRootFolder, inventoryService, userService, backendService);
184
185 m_commsManager 169 m_commsManager
186 = new CommunicationsLocal( 170 = new CommunicationsLocal(
187 m_openSim.ConfigurationSettings, m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, 171 m_openSim.ConfigurationSettings, m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache,
188 inventoryService, backendService, libraryRootFolder, m_openSim.ConfigurationSettings.DumpAssetsToFile); 172 libraryRootFolder, m_openSim.ConfigurationSettings.DumpAssetsToFile);
189 173
190 CreateGridInfoService(); 174 CreateGridInfoService();
191 } 175 }
@@ -202,22 +186,7 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
202 } 186 }
203 187
204 protected virtual void InitialiseHGStandaloneServices(LibraryRootFolder libraryRootFolder) 188 protected virtual void InitialiseHGStandaloneServices(LibraryRootFolder libraryRootFolder)
205 { 189 {
206 // Standalone mode
207
208 HGInventoryServiceClient inventoryService
209 = new HGInventoryServiceClient(m_openSim.NetServersInfo.InventoryURL, null, false);
210 List<IInventoryDataPlugin> plugins
211 = DataPluginFactory.LoadDataPlugins<IInventoryDataPlugin>(
212 m_openSim.ConfigurationSettings.StandaloneInventoryPlugin,
213 m_openSim.ConfigurationSettings.StandaloneInventorySource);
214
215 foreach (IInventoryDataPlugin plugin in plugins)
216 {
217 // Using the OSP wrapper plugin should be made configurable at some point
218 inventoryService.AddPlugin(new OspInventoryWrapperPlugin(plugin));
219 }
220
221 HGGridServicesStandalone gridService 190 HGGridServicesStandalone gridService
222 = new HGGridServicesStandalone( 191 = new HGGridServicesStandalone(
223 m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, m_openSim.SceneManager); 192 m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, m_openSim.SceneManager);
@@ -225,10 +194,9 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
225 m_commsManager 194 m_commsManager
226 = new HGCommunicationsStandalone( 195 = new HGCommunicationsStandalone(
227 m_openSim.ConfigurationSettings, m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, 196 m_openSim.ConfigurationSettings, m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache,
228 inventoryService, gridService, 197 gridService,
229 libraryRootFolder, m_openSim.ConfigurationSettings.DumpAssetsToFile); 198 libraryRootFolder, m_openSim.ConfigurationSettings.DumpAssetsToFile);
230 199
231 inventoryService.UserProfileCache = m_commsManager.UserProfileCacheService;
232 HGServices = gridService; 200 HGServices = gridService;
233 201
234 CreateGridInfoService(); 202 CreateGridInfoService();