mirror of
https://github.com/opensim/opensim.git
synced 2026-08-12 12:25:42 +08:00
Heart surgery no.2: the inventory service hooks.
Several improvements in the connectors themselves. Several improvements in configurations. Needed to add a hack in IUserService and UserManagerBase, to be removed when that service is refactored.
This commit is contained in:
@@ -29,6 +29,7 @@ using System.Collections.Generic;
|
||||
using System.Reflection;
|
||||
using log4net;
|
||||
using OpenMetaverse;
|
||||
using OpenSim.Services.Interfaces;
|
||||
|
||||
namespace OpenSim.Framework.Communications.Cache
|
||||
{
|
||||
@@ -66,6 +67,8 @@ namespace OpenSim.Framework.Communications.Cache
|
||||
/// </summary>
|
||||
public readonly InventoryFolderImpl LibraryRoot;
|
||||
|
||||
private IInventoryService m_InventoryService;
|
||||
|
||||
/// <summary>
|
||||
/// Constructor
|
||||
/// </summary>
|
||||
@@ -77,6 +80,11 @@ namespace OpenSim.Framework.Communications.Cache
|
||||
LibraryRoot = libraryRootFolder;
|
||||
}
|
||||
|
||||
public void SetInventoryService(IInventoryService invService)
|
||||
{
|
||||
m_InventoryService = invService;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// A new user has moved into a region in this instance so retrieve their profile from the user service.
|
||||
/// </summary>
|
||||
@@ -200,7 +208,7 @@ namespace OpenSim.Framework.Communications.Cache
|
||||
/// <param name="userProfile"></param>
|
||||
protected CachedUserInfo AddToCaches(UserProfileData userProfile)
|
||||
{
|
||||
CachedUserInfo createdUserInfo = new CachedUserInfo(m_commsManager, userProfile);
|
||||
CachedUserInfo createdUserInfo = new CachedUserInfo(m_InventoryService, userProfile);
|
||||
|
||||
lock (m_userProfilesById)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user