aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Communications/Local/CommunicationsLocal.cs35
1 files changed, 9 insertions, 26 deletions
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index eed21a4..a00b35f 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -38,43 +38,26 @@ using OpenSim.Framework.Utilities;
38namespace OpenSim.Region.Communications.Local 38namespace OpenSim.Region.Communications.Local
39{ 39{
40 public class CommunicationsLocal : CommunicationsManager 40 public class CommunicationsLocal : CommunicationsManager
41 { 41 {
42 public LocalBackEndServices InstanceServices;
43
44 public LocalLoginService LoginServices;
45
46 protected LocalSettings m_settings;
47
48 protected CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache)
49 : base(serversInfo, httpServer, assetCache)
50 {
51
52 }
53
54 public CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, LocalSettings settings) 42 public CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, LocalSettings settings)
55 : base(serversInfo, httpServer, assetCache) 43 : base(serversInfo, httpServer, assetCache)
56 { 44 {
57 m_settings = settings;
58
59 LocalInventoryService inventoryService = new LocalInventoryService(); 45 LocalInventoryService inventoryService = new LocalInventoryService();
60 inventoryService.AddPlugin(m_settings.InventoryPlugin); 46 inventoryService.AddPlugin(settings.InventoryPlugin);
61 m_inventoryService = inventoryService; 47 m_inventoryService = inventoryService;
62 48
63 LocalUserServices userService = new LocalUserServices(this, serversInfo); 49 LocalUserServices userService = new LocalUserServices(this, serversInfo);
64 userService.AddPlugin(m_settings.UserDatabasePlugin); 50 userService.AddPlugin(settings.UserDatabasePlugin);
65 m_userService = userService; 51 m_userService = userService;
66 52
67 InstanceServices = new LocalBackEndServices(); 53 LocalBackEndServices backendService = new LocalBackEndServices();
68 m_gridService = InstanceServices; 54 m_gridService = backendService;
69 m_interRegion = InstanceServices; 55 m_interRegion = backendService;
70 56
71 LoginServices = new LocalLoginService(userService, m_settings.WelcomeMessage, this, serversInfo, m_settings.AccountAuthentication); 57 LocalLoginService loginService = new LocalLoginService(userService, settings.WelcomeMessage, this, serversInfo, settings.AccountAuthentication);
72 httpServer.AddXmlRPCHandler("login_to_simulator", LoginServices.XmlRpcLoginMethod); 58 loginService.OnLoginToRegion += backendService.AddNewSession;
73 }
74 59
75 internal void InformRegionOfLogin(ulong regionHandle, Login login) 60 httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod);
76 {
77 this.InstanceServices.AddNewSession(regionHandle, login);
78 } 61 }
79 62
80 public void doCreate(string[] cmmdParams) 63 public void doCreate(string[] cmmdParams)