diff options
Started to clean up the mess with HyperAssets in LLClientView. Fixed HG access to Notecards in user's inventory.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs index b0555da..6fdd2a8 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | |||
@@ -192,6 +192,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
192 | m_assMapper.Post(item.AssetID, receiver, userAssetServer); | 192 | m_assMapper.Post(item.AssetID, receiver, userAssetServer); |
193 | } | 193 | } |
194 | 194 | ||
195 | |||
196 | |||
195 | #endregion | 197 | #endregion |
196 | 198 | ||
197 | public bool IsForeignUser(UUID userID, out string assetServerURL) | 199 | public bool IsForeignUser(UUID userID, out string assetServerURL) |
@@ -217,5 +219,16 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
217 | 219 | ||
218 | return false; | 220 | return false; |
219 | } | 221 | } |
222 | |||
223 | protected override InventoryItemBase GetItem(UUID agentID, UUID itemID) | ||
224 | { | ||
225 | InventoryItemBase item = base.GetItem(agentID, itemID); | ||
226 | |||
227 | string userAssetServer = string.Empty; | ||
228 | if (IsForeignUser(agentID, out userAssetServer)) | ||
229 | m_assMapper.Get(item.AssetID, agentID, userAssetServer); | ||
230 | |||
231 | return item; | ||
232 | } | ||
220 | } | 233 | } |
221 | } | 234 | } |