From 84d6b024756a051fae1a6a24a925fa29f44b5c4e Mon Sep 17 00:00:00 2001
From: MW
Date: Tue, 3 Mar 2009 16:36:21 +0000
Subject: Renamed ILoginRegionsConnector to ILoginServiceToRegionsConnector and
moved it from OpenSim.Client.Linden to OpenSim.Framework.
---
OpenSim/Client/Linden/ILoginRegionsConnector.cs | 43 ----------------------
OpenSim/Client/Linden/LLStandaloneLoginModule.cs | 2 +-
OpenSim/Client/Linden/LLStandaloneLoginService.cs | 4 +-
.../Communications/Tests/LoginServiceTests.cs | 2 +-
.../Framework/ILoginServiceToRegionsConnector.cs | 42 +++++++++++++++++++++
5 files changed, 46 insertions(+), 47 deletions(-)
delete mode 100644 OpenSim/Client/Linden/ILoginRegionsConnector.cs
create mode 100644 OpenSim/Framework/ILoginServiceToRegionsConnector.cs
diff --git a/OpenSim/Client/Linden/ILoginRegionsConnector.cs b/OpenSim/Client/Linden/ILoginRegionsConnector.cs
deleted file mode 100644
index 3f3cee0..0000000
--- a/OpenSim/Client/Linden/ILoginRegionsConnector.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSimulator Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using OpenMetaverse;
-using OpenSim.Framework;
-
-namespace OpenSim.Client.Linden
-{
- public interface ILoginRegionsConnector
- {
- bool RegionLoginsEnabled { get; }
- void LogOffUserFromGrid(ulong regionHandle, UUID AvatarID, UUID RegionSecret, string message);
- bool NewUserConnection(ulong regionHandle, AgentCircuitData agent);
- RegionInfo RequestClosestRegion(string region);
- RegionInfo RequestNeighbourInfo(UUID regionID);
- RegionInfo RequestNeighbourInfo(ulong regionhandle);
- }
-}
diff --git a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs
index c5db38b..686a621 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 f772185..5f43814 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 854d68d..c737817 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/Framework/ILoginServiceToRegionsConnector.cs b/OpenSim/Framework/ILoginServiceToRegionsConnector.cs
new file mode 100644
index 0000000..0ce9924
--- /dev/null
+++ b/OpenSim/Framework/ILoginServiceToRegionsConnector.cs
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using OpenMetaverse;
+
+namespace OpenSim.Framework
+{
+ public interface ILoginServiceToRegionsConnector
+ {
+ bool RegionLoginsEnabled { get; }
+ void LogOffUserFromGrid(ulong regionHandle, UUID AvatarID, UUID RegionSecret, string message);
+ bool NewUserConnection(ulong regionHandle, AgentCircuitData agent);
+ RegionInfo RequestClosestRegion(string region);
+ RegionInfo RequestNeighbourInfo(UUID regionID);
+ RegionInfo RequestNeighbourInfo(ulong regionhandle);
+ }
+}
--
cgit v1.1