aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Communications/Local/CommunicationsLocal.cs')
-rw-r--r--OpenSim/Region/Communications/Local/CommunicationsLocal.cs8
1 files changed, 2 insertions, 6 deletions
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index a00b35f..76814cf 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -39,15 +39,13 @@ 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) 42 public CommunicationsLocal(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, LocalSettings settings, LocalUserServices userService)
43 : base(serversInfo, httpServer, assetCache) 43 : base(serversInfo, httpServer, assetCache)
44 { 44 {
45 LocalInventoryService inventoryService = new LocalInventoryService(); 45 LocalInventoryService inventoryService = new LocalInventoryService();
46 inventoryService.AddPlugin(settings.InventoryPlugin); 46 inventoryService.AddPlugin(settings.InventoryPlugin);
47 m_inventoryService = inventoryService; 47 m_inventoryService = inventoryService;
48 48
49 LocalUserServices userService = new LocalUserServices(this, serversInfo);
50 userService.AddPlugin(settings.UserDatabasePlugin);
51 m_userService = userService; 49 m_userService = userService;
52 50
53 LocalBackEndServices backendService = new LocalBackEndServices(); 51 LocalBackEndServices backendService = new LocalBackEndServices();
@@ -118,14 +116,12 @@ namespace OpenSim.Region.Communications.Local
118 public string WelcomeMessage; 116 public string WelcomeMessage;
119 public bool AccountAuthentication = false; 117 public bool AccountAuthentication = false;
120 public string InventoryPlugin; 118 public string InventoryPlugin;
121 public string UserDatabasePlugin;
122 119
123 public LocalSettings(string welcomeMessage, bool accountsAuthenticate, string inventoryPlugin, string userPlugin) 120 public LocalSettings(string welcomeMessage, bool accountsAuthenticate, string inventoryPlugin)
124 { 121 {
125 WelcomeMessage = welcomeMessage; 122 WelcomeMessage = welcomeMessage;
126 AccountAuthentication = accountsAuthenticate; 123 AccountAuthentication = accountsAuthenticate;
127 InventoryPlugin = inventoryPlugin; 124 InventoryPlugin = inventoryPlugin;
128 UserDatabasePlugin = userPlugin;
129 } 125 }
130 } 126 }
131 127