diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs index 6f7f34f..c5f8921 100644 --- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs | |||
@@ -31,8 +31,9 @@ using Nini.Config; | |||
31 | using OpenMetaverse; | 31 | using OpenMetaverse; |
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenSim.Framework.Communications; | 33 | using OpenSim.Framework.Communications; |
34 | using OpenSim.Framework.Communications.Cache; | 34 | |
35 | using OpenSim.Region.Framework.Interfaces; | 35 | using OpenSim.Region.Framework.Interfaces; |
36 | using OpenSim.Services.Interfaces; | ||
36 | 37 | ||
37 | namespace OpenSim.Region.Framework.Scenes.Hypergrid | 38 | namespace OpenSim.Region.Framework.Scenes.Hypergrid |
38 | { | 39 | { |
@@ -63,11 +64,11 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid | |||
63 | #region Constructors | 64 | #region Constructors |
64 | 65 | ||
65 | public HGScene(RegionInfo regInfo, AgentCircuitManager authen, | 66 | public HGScene(RegionInfo regInfo, AgentCircuitManager authen, |
66 | CommunicationsManager commsMan, SceneCommunicationService sceneGridService, | 67 | SceneCommunicationService sceneGridService, |
67 | StorageManager storeManager, | 68 | StorageManager storeManager, |
68 | ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, | 69 | ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, |
69 | bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) | 70 | bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) |
70 | : base(regInfo, authen, commsMan, sceneGridService, storeManager, moduleLoader, | 71 | : base(regInfo, authen, sceneGridService, storeManager, moduleLoader, |
71 | dumpAssetsToFile, physicalPrim, SeeIntoRegionFromNeighbor, config, simulatorVersion) | 72 | dumpAssetsToFile, physicalPrim, SeeIntoRegionFromNeighbor, config, simulatorVersion) |
72 | { | 73 | { |
73 | m_log.Info("[HGScene]: Starting HGScene."); | 74 | m_log.Info("[HGScene]: Starting HGScene."); |
@@ -82,7 +83,7 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid | |||
82 | 83 | ||
83 | public void UploadInventoryItem(UUID avatarID, UUID assetID, string name, int userlevel) | 84 | public void UploadInventoryItem(UUID avatarID, UUID assetID, string name, int userlevel) |
84 | { | 85 | { |
85 | CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(avatarID); | 86 | UserAccount userInfo = UserAccountService.GetUserAccount(RegionInfo.ScopeID, avatarID); |
86 | if (userInfo != null) | 87 | if (userInfo != null) |
87 | { | 88 | { |
88 | m_assMapper.Post(assetID, avatarID); | 89 | m_assMapper.Post(assetID, avatarID); |