aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/ApplicationPlugins')
-rw-r--r--OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs29
1 files changed, 23 insertions, 6 deletions
diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
index 9ecb9ff..84e5db5 100644
--- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
@@ -26,6 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
29using System.Reflection; 30using System.Reflection;
30using log4net; 31using log4net;
31using OpenSim.Data; 32using OpenSim.Data;
@@ -33,6 +34,7 @@ using OpenSim.Framework;
33using OpenSim.Framework.Communications; 34using OpenSim.Framework.Communications;
34using OpenSim.Framework.Communications.Services; 35using OpenSim.Framework.Communications.Services;
35using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework.Communications.Cache;
37using OpenSim.Framework.Communications.Osp;
36using OpenSim.Framework.Servers; 38using OpenSim.Framework.Servers;
37using OpenSim.Region.Communications.Hypergrid; 39using OpenSim.Region.Communications.Hypergrid;
38using OpenSim.Region.Communications.Local; 40using OpenSim.Region.Communications.Local;
@@ -164,8 +166,16 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
164 protected virtual void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder) 166 protected virtual void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder)
165 { 167 {
166 LocalInventoryService inventoryService = new LocalInventoryService(); 168 LocalInventoryService inventoryService = new LocalInventoryService();
167 inventoryService.AddPlugin(m_openSim.ConfigurationSettings.StandaloneInventoryPlugin, 169 List<IInventoryDataPlugin> plugins
168 m_openSim.ConfigurationSettings.StandaloneInventorySource); 170 = DataPluginFactory.LoadDataPlugins<IInventoryDataPlugin>(
171 m_openSim.ConfigurationSettings.StandaloneInventoryPlugin,
172 m_openSim.ConfigurationSettings.StandaloneInventorySource);
173
174 foreach (IInventoryDataPlugin plugin in plugins)
175 {
176 // Using the OSP wrapper plugin for database plugins should be made configurable at some point
177 inventoryService.AddPlugin(new OspInventoryWrapperPlugin(plugin));
178 }
169 179
170 LocalBackEndServices backendService = new LocalBackEndServices(); 180 LocalBackEndServices backendService = new LocalBackEndServices();
171 181
@@ -186,7 +196,7 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
186 196
187 m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler()); 197 m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler());
188 m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim)); 198 m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim));
189 if(m_openSim.userStatsURI != String.Empty ) 199 if (m_openSim.userStatsURI != String.Empty )
190 m_httpServer.AddStreamHandler(new OpenSim.UXSimStatusHandler(m_openSim)); 200 m_httpServer.AddStreamHandler(new OpenSim.UXSimStatusHandler(m_openSim));
191 } 201 }
192 202
@@ -196,9 +206,16 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
196 206
197 HGInventoryServiceClient inventoryService 207 HGInventoryServiceClient inventoryService
198 = new HGInventoryServiceClient(m_openSim.NetServersInfo.InventoryURL, null, false); 208 = new HGInventoryServiceClient(m_openSim.NetServersInfo.InventoryURL, null, false);
199 inventoryService.AddPlugin( 209 List<IInventoryDataPlugin> plugins
200 m_openSim.ConfigurationSettings.StandaloneInventoryPlugin, 210 = DataPluginFactory.LoadDataPlugins<IInventoryDataPlugin>(
201 m_openSim.ConfigurationSettings.StandaloneInventorySource); 211 m_openSim.ConfigurationSettings.StandaloneInventoryPlugin,
212 m_openSim.ConfigurationSettings.StandaloneInventorySource);
213
214 foreach (IInventoryDataPlugin plugin in plugins)
215 {
216 // Using the OSP wrapper plugin should be made configurable at some point
217 inventoryService.AddPlugin(new OspInventoryWrapperPlugin(plugin));
218 }
202 219
203 HGGridServicesStandalone gridService 220 HGGridServicesStandalone gridService
204 = new HGGridServicesStandalone( 221 = new HGGridServicesStandalone(