From 02a15bc787b2cc6784c9626e041a4365ec362194 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 4 Jul 2010 13:56:03 -0700
Subject: Started to clean up the mess with HyperAssets in LLClientView. Fixed
HG access to Notecards in user's inventory.
---
OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs | 1 +
.../Region/ClientStack/LindenUDP/LLClientView.cs | 89 ++--------------------
.../Framework/InventoryAccess/HGAssetMapper.cs | 2 +
.../InventoryAccess/HGInventoryAccessModule.cs | 13 ++++
.../InventoryAccess/InventoryAccessModule.cs | 52 +++++++++++++
.../Framework/Interfaces/IInventoryAccessModule.cs | 2 +
6 files changed, 78 insertions(+), 81 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
index 9869a99..f6ad6e1 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
@@ -379,6 +379,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{
// Try the user's inventory, but only if it's different from the regions'
string userAssets = HyperAssets.GetUserAssetServer(AgentID);
+
if ((userAssets != string.Empty) && (userAssets != HyperAssets.GetSimAssetServer()))
{
m_log.DebugFormat("[J2KIMAGE]: texture {0} not found in local asset storage. Trying user's storage.", id);
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index d2824bd..3a2c019 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -7196,59 +7196,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP
}
else // Agent
{
- IInventoryService invService = m_scene.RequestModuleInterface<IInventoryService>();
- InventoryItemBase assetRequestItem = new InventoryItemBase(itemID, AgentId);
- assetRequestItem = invService.GetItem(assetRequestItem);
- if (assetRequestItem == null)
+ IInventoryAccessModule invAccess = m_scene.RequestModuleInterface<IInventoryAccessModule>();
+ if (invAccess != null)
{
- ILibraryService lib = m_scene.RequestModuleInterface<ILibraryService>();
- if (lib != null)
- assetRequestItem = lib.LibraryRootFolder.FindItem(itemID);
- if (assetRequestItem == null)
- return true;
- }
+ if (!invAccess.GetAgentInventoryItem(this, itemID, requestID))
+ return false;
- // At this point, we need to apply perms
- // only to notecards and scripts. All
- // other asset types are always available
- //
- if (assetRequestItem.AssetType == (int)AssetType.LSLText)
- {
- if (!((Scene)m_scene).Permissions.CanViewScript(itemID, UUID.Zero, AgentId))
- {
- SendAgentAlertMessage("Insufficient permissions to view script", false);
- return true;
- }
- }
- else if (assetRequestItem.AssetType == (int)AssetType.Notecard)
- {
- if (!((Scene)m_scene).Permissions.CanViewNotecard(itemID, UUID.Zero, AgentId))
- {
- SendAgentAlertMessage("Insufficient permissions to view notecard", false);
- return true;
- }
}
+ else
+ return false;
- if (assetRequestItem.AssetID != requestID)
- {
- m_log.WarnFormat(
- "[CLIENT]: {0} requested asset {1} from item {2} but this does not match item's asset {3}",
- Name, requestID, itemID, assetRequestItem.AssetID);
- return true;
- }
}
}
}
- //m_assetCache.AddAssetRequest(this, transfer);
-
MakeAssetRequest(transfer, taskID);
- /* RequestAsset = OnRequestAsset;
- if (RequestAsset != null)
- {
- RequestAsset(this, transfer);
- }*/
return true;
}
@@ -11459,15 +11422,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
else if (transferRequest.TransferInfo.SourceType == (int)SourceType.SimInventoryItem)
{
requestID = new UUID(transferRequest.TransferInfo.Params, 80);
- //m_log.Debug("[XXX] inventory asset request " + requestID);
- //if (taskID == UUID.Zero) // Agent
- // if (m_scene is HGScene)
- // {
- // m_log.Debug("[XXX] hg asset request " + requestID);
- // // We may need to fetch the asset from the user's asset server into the local asset server
- // HGAssetMapper mapper = ((HGScene)m_scene).AssetMapper;
- // mapper.Get(requestID, AgentId);
- // }
}
// m_log.DebugFormat("[CLIENT]: {0} requesting asset {1}", Name, requestID);
@@ -11488,44 +11442,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
UUID requestID = UUID.Zero;
byte source = (byte)SourceType.Asset;
- if ((transferRequest.TransferInfo.SourceType == (int)SourceType.Asset)
- || (transferRequest.TransferInfo.SourceType == 2222))
+ if (transferRequest.TransferInfo.SourceType == (int)SourceType.Asset)
{
requestID = new UUID(transferRequest.TransferInfo.Params, 0);
}
- else if ((transferRequest.TransferInfo.SourceType == (int)SourceType.SimInventoryItem)
- || (transferRequest.TransferInfo.SourceType == 3333))
+ else if (transferRequest.TransferInfo.SourceType == (int)SourceType.SimInventoryItem)
{
requestID = new UUID(transferRequest.TransferInfo.Params, 80);
source = (byte)SourceType.SimInventoryItem;
//m_log.Debug("asset request " + requestID);
}
- if (null == asset)
- {
- if ((m_hyperAssets != null) && (transferRequest.TransferInfo.SourceType < 2000))
- {
- // Try the user's inventory, but only if it's different from the regions'
- string userAssets = m_hyperAssets.GetUserAssetServer(AgentId);
- if ((userAssets != string.Empty) && (userAssets != m_hyperAssets.GetSimAssetServer()))
- {
- m_log.DebugFormat("[CLIENT]: asset {0} not found in local asset storage. Trying user's storage.", id);
- if (transferRequest.TransferInfo.SourceType == (int)SourceType.Asset)
- transferRequest.TransferInfo.SourceType = 2222; // marker
- else if (transferRequest.TransferInfo.SourceType == (int)SourceType.SimInventoryItem)
- transferRequest.TransferInfo.SourceType = 3333; // marker
-
- m_assetService.Get(userAssets + "/" + id, transferRequest, AssetReceived);
- return;
- }
- }
-
- //m_log.DebugFormat("[ASSET CACHE]: Asset transfer request for asset which is {0} already known to be missing. Dropping", requestID);
-
- // FIXME: We never tell the client about assets which do not exist when requested by this transfer mechanism, which can't be right.
- return;
- }
-
// Scripts cannot be retrieved by direct request
if (transferRequest.TransferInfo.SourceType == (int)SourceType.Asset && asset.Type == 10)
return;
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
index c1e92f5..b13b9d8 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
@@ -157,6 +157,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
Dictionary<UUID, AssetType> ids = new Dictionary<UUID, AssetType>();
HGUuidGatherer uuidGatherer = new HGUuidGatherer(this, m_scene.AssetService, userAssetURL);
uuidGatherer.GatherAssetUuids(asset.FullID, (AssetType)asset.Type, ids);
+ if (ids.ContainsKey(assetID))
+ ids.Remove(assetID);
foreach (UUID uuid in ids.Keys)
FetchAsset(userAssetURL, uuid);
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
m_assMapper.Post(item.AssetID, receiver, userAssetServer);
}
+
+
#endregion
public bool IsForeignUser(UUID userID, out string assetServerURL)
@@ -217,5 +219,16 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
return false;
}
+
+ protected override InventoryItemBase GetItem(UUID agentID, UUID itemID)
+ {
+ InventoryItemBase item = base.GetItem(agentID, itemID);
+
+ string userAssetServer = string.Empty;
+ if (IsForeignUser(agentID, out userAssetServer))
+ m_assMapper.Get(item.AssetID, agentID, userAssetServer);
+
+ return item;
+ }
}
}
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 12b6aa0..39616f7 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -639,6 +639,50 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
{
}
+ public virtual bool GetAgentInventoryItem(IClientAPI remoteClient, UUID itemID, UUID requestID)
+ {
+ InventoryItemBase assetRequestItem = GetItem(remoteClient.AgentId, itemID);
+ if (assetRequestItem == null)
+ {
+ ILibraryService lib = m_Scene.RequestModuleInterface<ILibraryService>();
+ if (lib != null)
+ assetRequestItem = lib.LibraryRootFolder.FindItem(itemID);
+ if (assetRequestItem == null)
+ return false;
+ }
+
+ // At this point, we need to apply perms
+ // only to notecards and scripts. All
+ // other asset types are always available
+ //
+ if (assetRequestItem.AssetType == (int)AssetType.LSLText)
+ {
+ if (!m_Scene.Permissions.CanViewScript(itemID, UUID.Zero, remoteClient.AgentId))
+ {
+ remoteClient.SendAgentAlertMessage("Insufficient permissions to view script", false);
+ return false;
+ }
+ }
+ else if (assetRequestItem.AssetType == (int)AssetType.Notecard)
+ {
+ if (!m_Scene.Permissions.CanViewNotecard(itemID, UUID.Zero, remoteClient.AgentId))
+ {
+ remoteClient.SendAgentAlertMessage("Insufficient permissions to view notecard", false);
+ return false;
+ }
+ }
+
+ if (assetRequestItem.AssetID != requestID)
+ {
+ m_log.WarnFormat(
+ "[CLIENT]: {0} requested asset {1} from item {2} but this does not match item's asset {3}",
+ Name, requestID, itemID, assetRequestItem.AssetID);
+ return false;
+ }
+
+ return true;
+ }
+
#endregion
#region Misc
@@ -661,6 +705,14 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
return asset;
}
+ protected virtual InventoryItemBase GetItem(UUID agentID, UUID itemID)
+ {
+ IInventoryService invService = m_Scene.RequestModuleInterface<IInventoryService>();
+ InventoryItemBase assetRequestItem = new InventoryItemBase(itemID, agentID);
+ assetRequestItem = invService.GetItem(assetRequestItem);
+ return assetRequestItem;
+ }
+
#endregion
}
}
diff --git a/OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs b/OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs
index 97f4188..2d4f509 100644
--- a/OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs
@@ -43,5 +43,7 @@ namespace OpenSim.Region.Framework.Interfaces
UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment);
void TransferInventoryAssets(InventoryItemBase item, UUID sender, UUID receiver);
+ bool GetAgentInventoryItem(IClientAPI remoteClient, UUID itemID, UUID requestID);
+ //bool GetTextureFromAgentInventory(UUID agentID, UUID assetID);
}
}
--
cgit v1.1