diff options
author | Justin Clarke Casey | 2009-04-22 23:04:32 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-04-22 23:04:32 +0000 |
commit | bd8e4a8892e204e2d9e7e24087f7200c16be57f0 (patch) | |
tree | c1d70399cd3f75a8bf97e09a9dcb8f652a1e8a3d /OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs | |
parent | * Resolve http://opensimulator.org/mantis/view.php?id=3509 by putting some se... (diff) | |
download | opensim-SC_OLD-bd8e4a8892e204e2d9e7e24087f7200c16be57f0.zip opensim-SC_OLD-bd8e4a8892e204e2d9e7e24087f7200c16be57f0.tar.gz opensim-SC_OLD-bd8e4a8892e204e2d9e7e24087f7200c16be57f0.tar.bz2 opensim-SC_OLD-bd8e4a8892e204e2d9e7e24087f7200c16be57f0.tar.xz |
* Fix hypergrid standalone login by overriding AddNewUserAgent in HGUserServices
Diffstat (limited to 'OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs')
-rw-r--r-- | OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs index c5aabc6..3b98038 100644 --- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs +++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs | |||
@@ -206,8 +206,11 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager | |||
206 | { | 206 | { |
207 | // Standalone mode | 207 | // Standalone mode |
208 | 208 | ||
209 | HGInventoryServiceClient inventoryService = new HGInventoryServiceClient(m_openSim.NetServersInfo.InventoryURL, null, false); | 209 | HGInventoryServiceClient inventoryService |
210 | inventoryService.AddPlugin(m_openSim.ConfigurationSettings.StandaloneInventoryPlugin, m_openSim.ConfigurationSettings.StandaloneInventorySource); | 210 | = new HGInventoryServiceClient(m_openSim.NetServersInfo.InventoryURL, null, false); |
211 | inventoryService.AddPlugin( | ||
212 | m_openSim.ConfigurationSettings.StandaloneInventoryPlugin, | ||
213 | m_openSim.ConfigurationSettings.StandaloneInventorySource); | ||
211 | 214 | ||
212 | HGGridServicesStandalone gridService | 215 | HGGridServicesStandalone gridService |
213 | = new HGGridServicesStandalone( | 216 | = new HGGridServicesStandalone( |
@@ -227,7 +230,10 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager | |||
227 | 230 | ||
228 | protected virtual void InitialiseHGGridServices(LibraryRootFolder libraryRootFolder) | 231 | protected virtual void InitialiseHGGridServices(LibraryRootFolder libraryRootFolder) |
229 | { | 232 | { |
230 | m_commsManager = new HGCommunicationsGridMode(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, m_openSim.SceneManager, libraryRootFolder); | 233 | m_commsManager |
234 | = new HGCommunicationsGridMode( | ||
235 | m_openSim.NetServersInfo, m_httpServer, | ||
236 | m_openSim.AssetCache, m_openSim.SceneManager, libraryRootFolder); | ||
231 | 237 | ||
232 | HGServices = ((HGCommunicationsGridMode) m_commsManager).HGServices; | 238 | HGServices = ((HGCommunicationsGridMode) m_commsManager).HGServices; |
233 | 239 | ||
@@ -240,7 +246,8 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager | |||
240 | // provide grid info | 246 | // provide grid info |
241 | m_gridInfoService = new GridInfoService(m_openSim.ConfigSource.Source); | 247 | m_gridInfoService = new GridInfoService(m_openSim.ConfigSource.Source); |
242 | m_httpServer.AddXmlRPCHandler("get_grid_info", m_gridInfoService.XmlRpcGridInfoMethod); | 248 | m_httpServer.AddXmlRPCHandler("get_grid_info", m_gridInfoService.XmlRpcGridInfoMethod); |
243 | m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info", m_gridInfoService.RestGetGridInfoMethod)); | 249 | m_httpServer.AddStreamHandler( |
250 | new RestStreamHandler("GET", "/get_grid_info", m_gridInfoService.RestGetGridInfoMethod)); | ||
244 | } | 251 | } |
245 | } | 252 | } |
246 | } | 253 | } |