aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMW2009-03-03 16:36:21 +0000
committerMW2009-03-03 16:36:21 +0000
commit84d6b024756a051fae1a6a24a925fa29f44b5c4e (patch)
tree51572c2c74ac04491e0ae4247fb34b2c661feb1e /OpenSim
parentforgotten files (diff)
downloadopensim-SC_OLD-84d6b024756a051fae1a6a24a925fa29f44b5c4e.zip
opensim-SC_OLD-84d6b024756a051fae1a6a24a925fa29f44b5c4e.tar.gz
opensim-SC_OLD-84d6b024756a051fae1a6a24a925fa29f44b5c4e.tar.bz2
opensim-SC_OLD-84d6b024756a051fae1a6a24a925fa29f44b5c4e.tar.xz
Renamed ILoginRegionsConnector to ILoginServiceToRegionsConnector and moved it from OpenSim.Client.Linden to OpenSim.Framework.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Client/Linden/LLStandaloneLoginModule.cs2
-rw-r--r--OpenSim/Client/Linden/LLStandaloneLoginService.cs4
-rw-r--r--OpenSim/Framework/Communications/Tests/LoginServiceTests.cs2
-rw-r--r--OpenSim/Framework/ILoginServiceToRegionsConnector.cs (renamed from OpenSim/Client/Linden/ILoginRegionsConnector.cs)5
4 files changed, 6 insertions, 7 deletions
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;
44 44
45namespace OpenSim.Client.Linden 45namespace OpenSim.Client.Linden
46{ 46{
47 public class LLStandaloneLoginModule : IRegionModule, ILoginRegionsConnector 47 public class LLStandaloneLoginModule : IRegionModule, ILoginServiceToRegionsConnector
48 { 48 {
49 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 49 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
50 50
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
61 /// <summary> 61 /// <summary>
62 /// Used to make requests to the local regions. 62 /// Used to make requests to the local regions.
63 /// </summary> 63 /// </summary>
64 protected ILoginRegionsConnector m_regionsConnector; 64 protected ILoginServiceToRegionsConnector m_regionsConnector;
65 65
66 66
67 public LLStandaloneLoginService( 67 public LLStandaloneLoginService(
68 UserManagerBase userManager, string welcomeMess, 68 UserManagerBase userManager, string welcomeMess,
69 IInterServiceInventoryServices interServiceInventoryService, 69 IInterServiceInventoryServices interServiceInventoryService,
70 NetworkServersInfo serversInfo, 70 NetworkServersInfo serversInfo,
71 bool authenticate, LibraryRootFolder libraryRootFolder, ILoginRegionsConnector regionsConnector) 71 bool authenticate, LibraryRootFolder libraryRootFolder, ILoginServiceToRegionsConnector regionsConnector)
72 : base(userManager, libraryRootFolder, welcomeMess) 72 : base(userManager, libraryRootFolder, welcomeMess)
73 { 73 {
74 this.serversInfo = serversInfo; 74 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
290 Assert.That(responseData["message"], Is.EqualTo("Hello folks")); 290 Assert.That(responseData["message"], Is.EqualTo("Hello folks"));
291 } 291 }
292 292
293 public class TestLoginToRegionConnector : ILoginRegionsConnector 293 public class TestLoginToRegionConnector : ILoginServiceToRegionsConnector
294 { 294 {
295 295
296 private List<RegionInfo> m_regionsList = new List<RegionInfo>(); 296 private List<RegionInfo> m_regionsList = new List<RegionInfo>();
diff --git a/OpenSim/Client/Linden/ILoginRegionsConnector.cs b/OpenSim/Framework/ILoginServiceToRegionsConnector.cs
index 3f3cee0..0ce9924 100644
--- a/OpenSim/Client/Linden/ILoginRegionsConnector.cs
+++ b/OpenSim/Framework/ILoginServiceToRegionsConnector.cs
@@ -27,11 +27,10 @@
27 27
28using System; 28using System;
29using OpenMetaverse; 29using OpenMetaverse;
30using OpenSim.Framework;
31 30
32namespace OpenSim.Client.Linden 31namespace OpenSim.Framework
33{ 32{
34 public interface ILoginRegionsConnector 33 public interface ILoginServiceToRegionsConnector
35 { 34 {
36 bool RegionLoginsEnabled { get; } 35 bool RegionLoginsEnabled { get; }
37 void LogOffUserFromGrid(ulong regionHandle, UUID AvatarID, UUID RegionSecret, string message); 36 void LogOffUserFromGrid(ulong regionHandle, UUID AvatarID, UUID RegionSecret, string message);