aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications
diff options
context:
space:
mode:
authorlbsa712007-10-02 00:00:12 +0000
committerlbsa712007-10-02 00:00:12 +0000
commitb5eaea7b0c627c55544f4099b50e9ac1a504fe17 (patch)
tree5104246df864943f368d5a4ddc88d5101c3155b8 /OpenSim/Region/Communications
parentremoved debug statements (diff)
downloadopensim-SC_OLD-b5eaea7b0c627c55544f4099b50e9ac1a504fe17.zip
opensim-SC_OLD-b5eaea7b0c627c55544f4099b50e9ac1a504fe17.tar.gz
opensim-SC_OLD-b5eaea7b0c627c55544f4099b50e9ac1a504fe17.tar.bz2
opensim-SC_OLD-b5eaea7b0c627c55544f4099b50e9ac1a504fe17.tar.xz
* Moved setup of LocalInventoryService and LocalUserServices to the app layer
* Killed off 'parent' relation from LocalUserServices to CommunicationsLocal * Deleted obsolete project InventoryServiceBase * Deleted superfluous createCol function
Diffstat (limited to 'OpenSim/Region/Communications')
-rw-r--r--OpenSim/Region/Communications/Local/CommunicationsLocal.cs8
-rw-r--r--OpenSim/Region/Communications/Local/LocalUserServices.cs14
2 files changed, 9 insertions, 13 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
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index 3bc4301..9e81fb8 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -8,20 +8,20 @@ namespace OpenSim.Region.Communications.Local
8{ 8{
9 public class LocalUserServices : UserManagerBase 9 public class LocalUserServices : UserManagerBase
10 { 10 {
11 private readonly CommunicationsLocal m_parent;
12
13 private readonly NetworkServersInfo m_serversInfo; 11 private readonly NetworkServersInfo m_serversInfo;
14 private readonly uint m_defaultHomeX; 12 private readonly uint m_defaultHomeX;
15 private readonly uint m_defaultHomeY; 13 private readonly uint m_defaultHomeY;
14 private IInventoryServices m_inventoryService;
16 15
17 16
18 public LocalUserServices(CommunicationsLocal parent, NetworkServersInfo serversInfo) 17 public LocalUserServices(NetworkServersInfo serversInfo, uint defaultHomeLocX, uint defaultHomeLocY, IInventoryServices inventoryService)
19 { 18 {
20 m_parent = parent;
21 m_serversInfo = serversInfo; 19 m_serversInfo = serversInfo;
22 20
23 m_defaultHomeX = m_serversInfo.DefaultHomeLocX; 21 m_defaultHomeX = defaultHomeLocX;
24 m_defaultHomeY = m_serversInfo.DefaultHomeLocY; 22 m_defaultHomeY = defaultHomeLocY;
23
24 m_inventoryService = inventoryService;
25 } 25 }
26 26
27 public override UserProfileData SetupMasterUser(string firstName, string lastName) 27 public override UserProfileData SetupMasterUser(string firstName, string lastName)
@@ -48,7 +48,7 @@ namespace OpenSim.Region.Communications.Local
48 } 48 }
49 else 49 else
50 { 50 {
51 m_parent.InventoryService.CreateNewUserInventory(profile.UUID); 51 m_inventoryService.CreateNewUserInventory(profile.UUID);
52 } 52 }
53 53
54 return profile; 54 return profile;