From 84d6b024756a051fae1a6a24a925fa29f44b5c4e Mon Sep 17 00:00:00 2001 From: MW Date: Tue, 3 Mar 2009 16:36:21 +0000 Subject: [PATCH] Renamed ILoginRegionsConnector to ILoginServiceToRegionsConnector and moved it from OpenSim.Client.Linden to OpenSim.Framework. --- OpenSim/Client/Linden/LLStandaloneLoginModule.cs | 2 +- OpenSim/Client/Linden/LLStandaloneLoginService.cs | 4 ++-- OpenSim/Framework/Communications/Tests/LoginServiceTests.cs | 2 +- .../ILoginServiceToRegionsConnector.cs} | 5 ++--- 4 files changed, 6 insertions(+), 7 deletions(-) rename OpenSim/{Client/Linden/ILoginRegionsConnector.cs => Framework/ILoginServiceToRegionsConnector.cs} (95%) diff --git a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs index c5db38b172..686a621331 100644 --- a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs +++ b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs @@ -44,7 +44,7 @@ using OpenSim.Region.Framework.Interfaces; namespace OpenSim.Client.Linden { - public class LLStandaloneLoginModule : IRegionModule, ILoginRegionsConnector + public class LLStandaloneLoginModule : IRegionModule, ILoginServiceToRegionsConnector { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); diff --git a/OpenSim/Client/Linden/LLStandaloneLoginService.cs b/OpenSim/Client/Linden/LLStandaloneLoginService.cs index f772185d69..5f43814d18 100644 --- a/OpenSim/Client/Linden/LLStandaloneLoginService.cs +++ b/OpenSim/Client/Linden/LLStandaloneLoginService.cs @@ -61,14 +61,14 @@ namespace OpenSim.Client.Linden /// /// Used to make requests to the local regions. /// - protected ILoginRegionsConnector m_regionsConnector; + protected ILoginServiceToRegionsConnector m_regionsConnector; public LLStandaloneLoginService( UserManagerBase userManager, string welcomeMess, IInterServiceInventoryServices interServiceInventoryService, NetworkServersInfo serversInfo, - bool authenticate, LibraryRootFolder libraryRootFolder, ILoginRegionsConnector regionsConnector) + bool authenticate, LibraryRootFolder libraryRootFolder, ILoginServiceToRegionsConnector regionsConnector) : base(userManager, libraryRootFolder, welcomeMess) { this.serversInfo = serversInfo; diff --git a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs index 854d68da59..c737817192 100644 --- a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs +++ b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs @@ -290,7 +290,7 @@ namespace OpenSim.Framework.Communications.Tests Assert.That(responseData["message"], Is.EqualTo("Hello folks")); } - public class TestLoginToRegionConnector : ILoginRegionsConnector + public class TestLoginToRegionConnector : ILoginServiceToRegionsConnector { private List m_regionsList = new List(); diff --git a/OpenSim/Client/Linden/ILoginRegionsConnector.cs b/OpenSim/Framework/ILoginServiceToRegionsConnector.cs similarity index 95% rename from OpenSim/Client/Linden/ILoginRegionsConnector.cs rename to OpenSim/Framework/ILoginServiceToRegionsConnector.cs index 3f3cee0342..0ce9924477 100644 --- a/OpenSim/Client/Linden/ILoginRegionsConnector.cs +++ b/OpenSim/Framework/ILoginServiceToRegionsConnector.cs @@ -27,11 +27,10 @@ using System; using OpenMetaverse; -using OpenSim.Framework; -namespace OpenSim.Client.Linden +namespace OpenSim.Framework { - public interface ILoginRegionsConnector + public interface ILoginServiceToRegionsConnector { bool RegionLoginsEnabled { get; } void LogOffUserFromGrid(ulong regionHandle, UUID AvatarID, UUID RegionSecret, string message);