aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Client/Linden
diff options
context:
space:
mode:
authorMW2009-03-03 16:36:21 +0000
committerMW2009-03-03 16:36:21 +0000
commit84d6b024756a051fae1a6a24a925fa29f44b5c4e (patch)
tree51572c2c74ac04491e0ae4247fb34b2c661feb1e /OpenSim/Client/Linden
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/Client/Linden')
-rw-r--r--OpenSim/Client/Linden/ILoginRegionsConnector.cs43
-rw-r--r--OpenSim/Client/Linden/LLStandaloneLoginModule.cs2
-rw-r--r--OpenSim/Client/Linden/LLStandaloneLoginService.cs4
3 files changed, 3 insertions, 46 deletions
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 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using OpenMetaverse;
30using OpenSim.Framework;
31
32namespace OpenSim.Client.Linden
33{
34 public interface ILoginRegionsConnector
35 {
36 bool RegionLoginsEnabled { get; }
37 void LogOffUserFromGrid(ulong regionHandle, UUID AvatarID, UUID RegionSecret, string message);
38 bool NewUserConnection(ulong regionHandle, AgentCircuitData agent);
39 RegionInfo RequestClosestRegion(string region);
40 RegionInfo RequestNeighbourInfo(UUID regionID);
41 RegionInfo RequestNeighbourInfo(ulong regionhandle);
42 }
43}
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;