ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 18:55:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

* refactor: break out inter grid inventory services further

Browse Source 
* more to follow
This commit is contained in:
Justin Clarke Casey
2008-07-23 22:18:09 +00:00
parent 1c9551eaae
commit 9af05d0bc3
10 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/Communications/Local/CommunicationsLocal.cs
View File

@@ -44,8 +44,9 @@ namespace OpenSim.Region.Communications.Local
IGridServices gridService, bool dumpAssetsToFile)
: base(serversInfo, httpServer, assetCache, dumpAssetsToFile)
{
AddInventoryService( inventoryService);
AddInventoryService(inventoryService);
m_defaultInventoryHost = inventoryService.Host;
m_interGridInventoryService = inventoryService;
m_userService = userService;
m_avatarService = (IAvatarService)userService;
m_gridService = gridService;

8
OpenSim/Region/Communications/Local/LocalLoginService.cs
View File

@@ -85,7 +85,7 @@ namespace OpenSim.Region.Communications.Local
profile = m_userManager.GetUserProfile(firstname, lastname);
if (profile != null)
{
m_Parent.InventoryService.CreateNewUserInventory(profile.ID);
m_Parent.InterGridInventoryService.CreateNewUserInventory(profile.ID);
}
return profile;
@@ -260,13 +260,13 @@ namespace OpenSim.Region.Communications.Local
// See LoginService
protected override InventoryData GetInventorySkeleton(LLUUID userID, string serverUrl)
{
List<InventoryFolderBase> folders = m_Parent.InventoryService.GetInventorySkeleton(userID);
List<InventoryFolderBase> folders = m_Parent.InterGridInventoryService.GetInventorySkeleton(userID);
// If we have user auth but no inventory folders for some reason, create a new set of folders.
if (null == folders || 0 == folders.Count)
{
m_Parent.InventoryService.CreateNewUserInventory(userID);
folders = m_Parent.InventoryService.GetInventorySkeleton(userID);
m_Parent.InterGridInventoryService.CreateNewUserInventory(userID);
folders = m_Parent.InterGridInventoryService.GetInventorySkeleton(userID);
}
LLUUID rootID = LLUUID.Zero;

8
OpenSim/Region/Communications/Local/LocalUserServices.cs
View File

@@ -37,7 +37,7 @@ namespace OpenSim.Region.Communications.Local
// private readonly NetworkServersInfo m_serversInfo;
private readonly uint m_defaultHomeX;
private readonly uint m_defaultHomeY;
private IInventoryServices m_inventoryService;
private IInterGridInventoryServices m_interGridInventoryService;
/// <summary>
///
@@ -48,14 +48,14 @@ namespace OpenSim.Region.Communications.Local
/// <param name="inventoryService"></param>
/// <param name="statsCollector">Can be null if stats collection is not required.</param>
public LocalUserServices(NetworkServersInfo serversInfo, uint defaultHomeLocX, uint defaultHomeLocY,
IInventoryServices inventoryService)
IInterGridInventoryServices interGridInventoryService)
{
// m_serversInfo = serversInfo;
m_defaultHomeX = defaultHomeLocX;
m_defaultHomeY = defaultHomeLocY;
m_inventoryService = inventoryService;
m_interGridInventoryService = interGridInventoryService;
}
public override UserProfileData SetupMasterUser(string firstName, string lastName)
@@ -82,7 +82,7 @@ namespace OpenSim.Region.Communications.Local
}
else
{
m_inventoryService.CreateNewUserInventory(profile.ID);
m_interGridInventoryService.CreateNewUserInventory(profile.ID);
}
return profile;

2
OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
View File

@@ -39,7 +39,7 @@ using OpenSim.Framework.Statistics;
namespace OpenSim.Region.Communications.OGS1
{
public class OGS1InventoryService : IInventoryServices
public class OGS1InventoryService : IInventoryServices, IInterGridInventoryServices
{
private static readonly ILog m_log
= LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

2
OpenSim/Region/Communications/OGS1/OGS1SecureInvenotryService.cs
View File

@@ -39,7 +39,7 @@ using OpenSim.Framework.Statistics;
namespace OpenSim.Region.Communications.OGS1
{
public class OGS1SecureInventoryService : ISecureInventoryService
public class OGS1SecureInventoryService : ISecureInventoryService, IInterGridInventoryServices
{
private static readonly ILog m_log
= LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);