diff options
author | Justin Clarke Casey | 2008-07-23 22:18:09 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-07-23 22:18:09 +0000 |
commit | 9af05d0bc3253376cecb7cf6586c53e8067bb2a4 (patch) | |
tree | 385327503fe674b34b5a10d585b199da7cc7cbbb /OpenSim/Region/Communications | |
parent | few additional fixed to get prim inventory up on nhibernate (diff) | |
download | opensim-SC-9af05d0bc3253376cecb7cf6586c53e8067bb2a4.zip opensim-SC-9af05d0bc3253376cecb7cf6586c53e8067bb2a4.tar.gz opensim-SC-9af05d0bc3253376cecb7cf6586c53e8067bb2a4.tar.bz2 opensim-SC-9af05d0bc3253376cecb7cf6586c53e8067bb2a4.tar.xz |
* refactor: break out inter grid inventory services further
* more to follow
Diffstat (limited to '')
5 files changed, 12 insertions, 11 deletions
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs index 5fd5524..3bc3f9a 100644 --- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs +++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs | |||
@@ -44,8 +44,9 @@ namespace OpenSim.Region.Communications.Local | |||
44 | IGridServices gridService, bool dumpAssetsToFile) | 44 | IGridServices gridService, bool dumpAssetsToFile) |
45 | : base(serversInfo, httpServer, assetCache, dumpAssetsToFile) | 45 | : base(serversInfo, httpServer, assetCache, dumpAssetsToFile) |
46 | { | 46 | { |
47 | AddInventoryService( inventoryService); | 47 | AddInventoryService(inventoryService); |
48 | m_defaultInventoryHost = inventoryService.Host; | 48 | m_defaultInventoryHost = inventoryService.Host; |
49 | m_interGridInventoryService = inventoryService; | ||
49 | m_userService = userService; | 50 | m_userService = userService; |
50 | m_avatarService = (IAvatarService)userService; | 51 | m_avatarService = (IAvatarService)userService; |
51 | m_gridService = gridService; | 52 | m_gridService = gridService; |
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs index 30a639a..98672c2 100644 --- a/OpenSim/Region/Communications/Local/LocalLoginService.cs +++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs | |||
@@ -85,7 +85,7 @@ namespace OpenSim.Region.Communications.Local | |||
85 | profile = m_userManager.GetUserProfile(firstname, lastname); | 85 | profile = m_userManager.GetUserProfile(firstname, lastname); |
86 | if (profile != null) | 86 | if (profile != null) |
87 | { | 87 | { |
88 | m_Parent.InventoryService.CreateNewUserInventory(profile.ID); | 88 | m_Parent.InterGridInventoryService.CreateNewUserInventory(profile.ID); |
89 | } | 89 | } |
90 | 90 | ||
91 | return profile; | 91 | return profile; |
@@ -260,13 +260,13 @@ namespace OpenSim.Region.Communications.Local | |||
260 | // See LoginService | 260 | // See LoginService |
261 | protected override InventoryData GetInventorySkeleton(LLUUID userID, string serverUrl) | 261 | protected override InventoryData GetInventorySkeleton(LLUUID userID, string serverUrl) |
262 | { | 262 | { |
263 | List<InventoryFolderBase> folders = m_Parent.InventoryService.GetInventorySkeleton(userID); | 263 | List<InventoryFolderBase> folders = m_Parent.InterGridInventoryService.GetInventorySkeleton(userID); |
264 | 264 | ||
265 | // If we have user auth but no inventory folders for some reason, create a new set of folders. | 265 | // If we have user auth but no inventory folders for some reason, create a new set of folders. |
266 | if (null == folders || 0 == folders.Count) | 266 | if (null == folders || 0 == folders.Count) |
267 | { | 267 | { |
268 | m_Parent.InventoryService.CreateNewUserInventory(userID); | 268 | m_Parent.InterGridInventoryService.CreateNewUserInventory(userID); |
269 | folders = m_Parent.InventoryService.GetInventorySkeleton(userID); | 269 | folders = m_Parent.InterGridInventoryService.GetInventorySkeleton(userID); |
270 | } | 270 | } |
271 | 271 | ||
272 | LLUUID rootID = LLUUID.Zero; | 272 | LLUUID rootID = LLUUID.Zero; |
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs index 798dd24..76791f1 100644 --- a/OpenSim/Region/Communications/Local/LocalUserServices.cs +++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs | |||
@@ -37,7 +37,7 @@ namespace OpenSim.Region.Communications.Local | |||
37 | // private readonly NetworkServersInfo m_serversInfo; | 37 | // private readonly NetworkServersInfo m_serversInfo; |
38 | private readonly uint m_defaultHomeX; | 38 | private readonly uint m_defaultHomeX; |
39 | private readonly uint m_defaultHomeY; | 39 | private readonly uint m_defaultHomeY; |
40 | private IInventoryServices m_inventoryService; | 40 | private IInterGridInventoryServices m_interGridInventoryService; |
41 | 41 | ||
42 | /// <summary> | 42 | /// <summary> |
43 | /// | 43 | /// |
@@ -48,14 +48,14 @@ namespace OpenSim.Region.Communications.Local | |||
48 | /// <param name="inventoryService"></param> | 48 | /// <param name="inventoryService"></param> |
49 | /// <param name="statsCollector">Can be null if stats collection is not required.</param> | 49 | /// <param name="statsCollector">Can be null if stats collection is not required.</param> |
50 | public LocalUserServices(NetworkServersInfo serversInfo, uint defaultHomeLocX, uint defaultHomeLocY, | 50 | public LocalUserServices(NetworkServersInfo serversInfo, uint defaultHomeLocX, uint defaultHomeLocY, |
51 | IInventoryServices inventoryService) | 51 | IInterGridInventoryServices interGridInventoryService) |
52 | { | 52 | { |
53 | // m_serversInfo = serversInfo; | 53 | // m_serversInfo = serversInfo; |
54 | 54 | ||
55 | m_defaultHomeX = defaultHomeLocX; | 55 | m_defaultHomeX = defaultHomeLocX; |
56 | m_defaultHomeY = defaultHomeLocY; | 56 | m_defaultHomeY = defaultHomeLocY; |
57 | 57 | ||
58 | m_inventoryService = inventoryService; | 58 | m_interGridInventoryService = interGridInventoryService; |
59 | } | 59 | } |
60 | 60 | ||
61 | public override UserProfileData SetupMasterUser(string firstName, string lastName) | 61 | public override UserProfileData SetupMasterUser(string firstName, string lastName) |
@@ -82,7 +82,7 @@ namespace OpenSim.Region.Communications.Local | |||
82 | } | 82 | } |
83 | else | 83 | else |
84 | { | 84 | { |
85 | m_inventoryService.CreateNewUserInventory(profile.ID); | 85 | m_interGridInventoryService.CreateNewUserInventory(profile.ID); |
86 | } | 86 | } |
87 | 87 | ||
88 | return profile; | 88 | return profile; |
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs index 05ecfcc..b86d9ea 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs | |||
@@ -39,7 +39,7 @@ using OpenSim.Framework.Statistics; | |||
39 | 39 | ||
40 | namespace OpenSim.Region.Communications.OGS1 | 40 | namespace OpenSim.Region.Communications.OGS1 |
41 | { | 41 | { |
42 | public class OGS1InventoryService : IInventoryServices | 42 | public class OGS1InventoryService : IInventoryServices, IInterGridInventoryServices |
43 | { | 43 | { |
44 | private static readonly ILog m_log | 44 | private static readonly ILog m_log |
45 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 45 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Region/Communications/OGS1/OGS1SecureInvenotryService.cs b/OpenSim/Region/Communications/OGS1/OGS1SecureInvenotryService.cs index 61c4e06..fbfc680 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1SecureInvenotryService.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1SecureInvenotryService.cs | |||
@@ -39,7 +39,7 @@ using OpenSim.Framework.Statistics; | |||
39 | 39 | ||
40 | namespace OpenSim.Region.Communications.OGS1 | 40 | namespace OpenSim.Region.Communications.OGS1 |
41 | { | 41 | { |
42 | public class OGS1SecureInventoryService : ISecureInventoryService | 42 | public class OGS1SecureInventoryService : ISecureInventoryService, IInterGridInventoryServices |
43 | { | 43 | { |
44 | private static readonly ILog m_log | 44 | private static readonly ILog m_log |
45 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 45 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |