diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs index 05077b6f8a..f477df446f 100644 --- a/OpenSim/Framework/Communications/UserManagerBase.cs +++ b/OpenSim/Framework/Communications/UserManagerBase.cs @@ -46,7 +46,6 @@ namespace OpenSim.Framework.Communications private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - public UserConfig _config; private List _plugins = new List(); /// diff --git a/OpenSim/Grid/MessagingServer/MessageService.cs b/OpenSim/Grid/MessagingServer/MessageService.cs index 7be62b0e3b..dd6e445755 100644 --- a/OpenSim/Grid/MessagingServer/MessageService.cs +++ b/OpenSim/Grid/MessagingServer/MessageService.cs @@ -68,12 +68,10 @@ namespace OpenSim.Grid.MessagingServer uc.DatabaseConnect = cfg.DatabaseConnect; uc.DatabaseProvider = cfg.DatabaseProvider; - m_userManager._config = uc; m_userManager.AddPlugin(cfg.DatabaseProvider, cfg.DatabaseConnect); } - #region FriendList Methods /// diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index a9b4a4fe6f..6d9cedbcd7 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs @@ -99,12 +99,11 @@ namespace OpenSim.Grid.UserServer m_log.Info("[REGION]: Establishing data connection"); m_userManager = new UserManager(); - m_userManager._config = Cfg; m_userManager.AddPlugin(Cfg.DatabaseProvider, Cfg.DatabaseConnect); m_gridInfoService = new GridInfoService(); - m_interServiceInventoryService = new OGS1InterServiceInventoryService(m_userManager._config.InventoryUrl); + m_interServiceInventoryService = new OGS1InterServiceInventoryService(Cfg.InventoryUrl); m_loginService = new UserLoginService( m_userManager, m_interServiceInventoryService, new LibraryRootFolder(), Cfg, Cfg.DefaultStartupMsg); @@ -216,7 +215,7 @@ namespace OpenSim.Grid.UserServer { m_log.ErrorFormat( "[USERS]: Could not contact the inventory service at {0} to create an inventory for {1}", - m_userManager._config.InventoryUrl + "CreateInventory/", userID.UUID); + Cfg.InventoryUrl + "CreateInventory/", userID.UUID); } catch (Exception e) { @@ -247,13 +246,10 @@ namespace OpenSim.Grid.UserServer // RestObjectPosterResponse> requester = new RestObjectPosterResponse>(); // requester.ReturnResponseVal = TestResponse; // requester.BeginPostObject(m_userManager._config.InventoryUrl + "RootFolders/", m_lastCreatedUser); - SynchronousRestObjectPoster.BeginPostObject>("POST", - m_userManager. - _config. - InventoryUrl + - "RootFolders/", - m_lastCreatedUser); - break; + SynchronousRestObjectPoster.BeginPostObject>( + "POST", Cfg.InventoryUrl + "RootFolders/", m_lastCreatedUser); + break; + case "logoff-user": if (cmdparams.Length >= 3)