From bd8e4a8892e204e2d9e7e24087f7200c16be57f0 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Wed, 22 Apr 2009 23:04:32 +0000 Subject: * Fix hypergrid standalone login by overriding AddNewUserAgent in HGUserServices --- .../CreateCommsManager/CreateCommsManagerPlugin.cs | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'OpenSim/ApplicationPlugins/CreateCommsManager') 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 { // Standalone mode - HGInventoryServiceClient inventoryService = new HGInventoryServiceClient(m_openSim.NetServersInfo.InventoryURL, null, false); - inventoryService.AddPlugin(m_openSim.ConfigurationSettings.StandaloneInventoryPlugin, m_openSim.ConfigurationSettings.StandaloneInventorySource); + HGInventoryServiceClient inventoryService + = new HGInventoryServiceClient(m_openSim.NetServersInfo.InventoryURL, null, false); + inventoryService.AddPlugin( + m_openSim.ConfigurationSettings.StandaloneInventoryPlugin, + m_openSim.ConfigurationSettings.StandaloneInventorySource); HGGridServicesStandalone gridService = new HGGridServicesStandalone( @@ -227,7 +230,10 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager protected virtual void InitialiseHGGridServices(LibraryRootFolder libraryRootFolder) { - m_commsManager = new HGCommunicationsGridMode(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, m_openSim.SceneManager, libraryRootFolder); + m_commsManager + = new HGCommunicationsGridMode( + m_openSim.NetServersInfo, m_httpServer, + m_openSim.AssetCache, m_openSim.SceneManager, libraryRootFolder); HGServices = ((HGCommunicationsGridMode) m_commsManager).HGServices; @@ -240,7 +246,8 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager // provide grid info m_gridInfoService = new GridInfoService(m_openSim.ConfigSource.Source); m_httpServer.AddXmlRPCHandler("get_grid_info", m_gridInfoService.XmlRpcGridInfoMethod); - m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info", m_gridInfoService.RestGetGridInfoMethod)); + m_httpServer.AddStreamHandler( + new RestStreamHandler("GET", "/get_grid_info", m_gridInfoService.RestGetGridInfoMethod)); } } } -- cgit v1.1