diff options
Diffstat (limited to 'OpenSim/Region/Communications/Local')
-rw-r--r-- | OpenSim/Region/Communications/Local/CommunicationsLocal.cs | 26 | ||||
-rw-r--r-- | OpenSim/Region/Communications/Local/LocalUserServices.cs | 1 |
2 files changed, 4 insertions, 23 deletions
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs index f51f564..7a00c5a 100644 --- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs +++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs | |||
@@ -39,34 +39,14 @@ namespace OpenSim.Region.Communications.Local | |||
39 | { | 39 | { |
40 | public class CommunicationsLocal : CommunicationsManager | 40 | public class CommunicationsLocal : CommunicationsManager |
41 | { | 41 | { |
42 | public CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, LocalSettings settings, LocalUserServices userService, LocalInventoryService inventoryService) | 42 | public CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, LocalUserServices userService, LocalInventoryService inventoryService, IInterRegionCommunications interRegionService, IGridServices gridService) |
43 | : base(serversInfo, httpServer, assetCache) | 43 | : base(serversInfo, httpServer, assetCache) |
44 | { | 44 | { |
45 | m_inventoryService = inventoryService; | 45 | m_inventoryService = inventoryService; |
46 | m_userService = userService; | 46 | m_userService = userService; |
47 | m_gridService = gridService; | ||
48 | m_interRegion = interRegionService; | ||
47 | 49 | ||
48 | LocalBackEndServices backendService = new LocalBackEndServices(); | ||
49 | m_gridService = backendService; | ||
50 | m_interRegion = backendService; | ||
51 | |||
52 | LocalLoginService loginService = new LocalLoginService(userService, settings.WelcomeMessage, this, serversInfo, settings.AccountAuthentication); | ||
53 | loginService.OnLoginToRegion += backendService.AddNewSession; | ||
54 | |||
55 | httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod); | ||
56 | } | ||
57 | |||
58 | |||
59 | |||
60 | public class LocalSettings | ||
61 | { | ||
62 | public string WelcomeMessage; | ||
63 | public bool AccountAuthentication = false; | ||
64 | |||
65 | public LocalSettings(string welcomeMessage, bool accountsAuthenticate) | ||
66 | { | ||
67 | WelcomeMessage = welcomeMessage; | ||
68 | AccountAuthentication = accountsAuthenticate; | ||
69 | } | ||
70 | } | 50 | } |
71 | 51 | ||
72 | } | 52 | } |
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs index 9e81fb8..4e75eb0 100644 --- a/OpenSim/Region/Communications/Local/LocalUserServices.cs +++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs | |||
@@ -22,6 +22,7 @@ namespace OpenSim.Region.Communications.Local | |||
22 | m_defaultHomeY = defaultHomeLocY; | 22 | m_defaultHomeY = defaultHomeLocY; |
23 | 23 | ||
24 | m_inventoryService = inventoryService; | 24 | m_inventoryService = inventoryService; |
25 | |||
25 | } | 26 | } |
26 | 27 | ||
27 | public override UserProfileData SetupMasterUser(string firstName, string lastName) | 28 | public override UserProfileData SetupMasterUser(string firstName, string lastName) |