From 7b49c711e93632276ee0f01a97ad67e9988f773a Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Fri, 28 Nov 2008 15:40:44 +0000 Subject: [PATCH] * minor: Eliminate unused paramter in LocalUserServices constructors --- OpenSim/Grid/UserServer/UserLoginService.cs | 4 ++-- OpenSim/Region/Application/HGOpenSimNode.cs | 4 ++-- OpenSim/Region/Application/OpenSimBase.cs | 4 ++-- OpenSim/Region/Communications/Local/LocalUserServices.cs | 8 ++------ .../Environment/Scenes/Tests/TestCommunicationsManager.cs | 2 +- 5 files changed, 9 insertions(+), 13 deletions(-) diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs index 230891039c..a0c96b27ae 100644 --- a/OpenSim/Grid/UserServer/UserLoginService.cs +++ b/OpenSim/Grid/UserServer/UserLoginService.cs @@ -72,12 +72,12 @@ namespace OpenSim.Grid.UserServer public void setloginlevel(int level) { m_minLoginLevel = level; - m_log.InfoFormat("[GRID] Login Level set to {0} ", level); + m_log.InfoFormat("[GRID]: Login Level set to {0} ", level); } public void setwelcometext(string text) { m_welcomeMessage = text; - m_log.InfoFormat("[GRID] Login text set to {0} ", text); + m_log.InfoFormat("[GRID]: Login text set to {0} ", text); } public override void LogOffUser(UserProfileData theUser, string message) diff --git a/OpenSim/Region/Application/HGOpenSimNode.cs b/OpenSim/Region/Application/HGOpenSimNode.cs index 7605bae47a..8f6fd5e124 100644 --- a/OpenSim/Region/Application/HGOpenSimNode.cs +++ b/OpenSim/Region/Application/HGOpenSimNode.cs @@ -82,8 +82,8 @@ namespace OpenSim inventoryService.AddPlugin(m_configSettings.StandaloneInventoryPlugin, m_configSettings.StandaloneInventorySource); LocalUserServices userService = - new LocalUserServices(m_networkServersInfo, m_networkServersInfo.DefaultHomeLocX, - m_networkServersInfo.DefaultHomeLocY, inventoryService); + new LocalUserServices( + m_networkServersInfo.DefaultHomeLocX, m_networkServersInfo.DefaultHomeLocY, inventoryService); userService.AddPlugin(m_configSettings.StandaloneUserPlugin, m_configSettings.StandaloneUserSource); //LocalBackEndServices backendService = new LocalBackEndServices(); diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 7ccb3d468f..f7ffa0099a 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs @@ -210,8 +210,8 @@ namespace OpenSim inventoryService.AddPlugin(m_configSettings.StandaloneInventoryPlugin, m_configSettings.StandaloneInventorySource); LocalUserServices userService = - new LocalUserServices(m_networkServersInfo, m_networkServersInfo.DefaultHomeLocX, - m_networkServersInfo.DefaultHomeLocY, inventoryService); + new LocalUserServices( + m_networkServersInfo.DefaultHomeLocX, m_networkServersInfo.DefaultHomeLocY, inventoryService); userService.AddPlugin(m_configSettings.StandaloneUserPlugin, m_configSettings.StandaloneUserSource); LocalBackEndServices backendService = new LocalBackEndServices(); diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs index e0c9c83ccc..f4fe686733 100644 --- a/OpenSim/Region/Communications/Local/LocalUserServices.cs +++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs @@ -40,17 +40,13 @@ namespace OpenSim.Region.Communications.Local /// /// User services used when OpenSim is running in standalone mode. /// - /// /// /// /// - /// Can be null if stats collection is not required. - public LocalUserServices(NetworkServersInfo serversInfo, uint defaultHomeLocX, uint defaultHomeLocY, - IInterServiceInventoryServices interServiceInventoryService) + public LocalUserServices( + uint defaultHomeLocX, uint defaultHomeLocY, IInterServiceInventoryServices interServiceInventoryService) : base(interServiceInventoryService) { - // m_serversInfo = serversInfo; - m_defaultHomeX = defaultHomeLocX; m_defaultHomeY = defaultHomeLocY; } diff --git a/OpenSim/Region/Environment/Scenes/Tests/TestCommunicationsManager.cs b/OpenSim/Region/Environment/Scenes/Tests/TestCommunicationsManager.cs index b9804d973d..1607e03599 100644 --- a/OpenSim/Region/Environment/Scenes/Tests/TestCommunicationsManager.cs +++ b/OpenSim/Region/Environment/Scenes/Tests/TestCommunicationsManager.cs @@ -42,7 +42,7 @@ namespace OpenSim.Region.Environment.Scenes.Tests m_interServiceInventoryService = lis; AddInventoryService(lis); - LocalUserServices lus = new LocalUserServices(null, 991, 992, lis); + LocalUserServices lus = new LocalUserServices(991, 992, lis); m_userService = lus; m_userServiceAdmin = lus; }